dorsale 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8867b1166c306db7c1c1227b6620e7ebf33052fa
-  data.tar.gz: 9307c0cc4c70c94828974ac1cd8c4de1b4fbf941
+  metadata.gz: 601a0abd6bb2d94e337dc1ef2c86ead60929cb7b
+  data.tar.gz: 2e97ac1b6964a7921f88d2f5e6f23c127c440134
 SHA512:
-  metadata.gz: 255fcb3f86de25c676ef57fb49b27ae7c33992cfa39ebddf00f97bafec4eb5332bc74d4a0d6909e289fab1bc59fd268fdaeb13af947d0212c3c91eb071e51f1d
-  data.tar.gz: 4be0167e0b53ddd496154153883b95a436fd3c14d18e1d487767a69ee3220c9068aa2d7675c42b89c157369cb34ad66f4184fca8cc5c8734a8b8588faf7df703
+  metadata.gz: 6e196d58c066e70e6a3185e076d28cd43e33661f3d3befde3934b0430e4ef795df7ff2141cf384b9dd2a74f136d9c0fbefc47c31a4183a5b10dafd24524beacf
+  data.tar.gz: cf0ba9e645236be9fcc4ac5b54459c6016e06b6fbd8eec5a23b08776575ed437ea7ed5392d5822177ab0ddfe731c311267b508b121b2b4047863840f7f842317

data/app/views/dorsale/billing_machine/invoices/_details.html.slim

@@ -20,15 +20,17 @@
           - if document.customer.present?
             = document.customer.name
             br
+            - if document.customer.address.present?
             = document.customer.address.street
-            br
-            = document.customer.address.street_bis
-            br
-            = document.customer.address.zip
-            = " "
-            = document.customer.address.city
-            br
-            = document.customer.address.country
+              - if document.customer.address.street_bis.present?
+                br
+                = document.customer.address.street_bis
+              br
+              = document.customer.address.zip
+              = " "
+              = document.customer.address.city
+              br
+              = document.customer.address.country
 
   table#lines-table
     thead
@@ -48,7 +50,8 @@
   .row
     .col-sm-6
       .well
-        = document.payment_term.try(:label)
+        = info document, :payment_term
+        br
 
         - if document_type == :invoice
           = info document, :due_date

data/app/views/dorsale/billing_machine/invoices/_form.html.slim

@@ -14,6 +14,7 @@
         .well
           - if @id_cards.one?
             = f.hidden_field :id_card_id
+            = info document, :id_card
           - else
             = f.input :id_card_id, collection: @id_cards
 

data/config/locales/common.fr.yml

@@ -147,6 +147,7 @@ fr:
     balance               : "Total à payer"
     expires_at            : "Date d'expiration"
     commercial_discount   : "Remise commerciale"
+    id_card               : "Carte d'identité"
 
   errors:
     messages:

data/db/migrate/20151103110115_add_is_active_to_users.rb

@@ -1,6 +1,6 @@
 class AddIsActiveToUsers < ActiveRecord::Migration
   def change
-    return if table_exists?(:users)
+    return if not table_exists?(:users)
     return if column_exists?(:users, :active)
     return if column_exists?(:users, :is_active)
 

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails