[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] c3acee: Fix #3879 Wrong translation i
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] c3acee: Fix #3879 Wrong translation in the new expense rep... |
|
Date: |
Fri, 18 Dec 2015 13:12:16 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: c3acee56e259960d513e6a6bed9197ef5a4082cb
https://github.com/Dolibarr/dolibarr/commit/c3acee56e259960d513e6a6bed9197ef5a4082cb
Author: aspangaro <address@hidden>
Date: 2015-12-12 (Sat, 12 Dec 2015)
Changed paths:
M htdocs/langs/en_US/trips.lang
Log Message:
-----------
Fix #3879 Wrong translation in the new expense report module
Commit: 1978eebb69d3c5cbbb5ab6b56cb6dfe837ef5e5b
https://github.com/Dolibarr/dolibarr/commit/1978eebb69d3c5cbbb5ab6b56cb6dfe837ef5e5b
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-13 (Sun, 13 Dec 2015)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Fix bad merge
Commit: e37fc87cd5dc35838d5e06f8c56169d4e55aced1
https://github.com/Dolibarr/dolibarr/commit/e37fc87cd5dc35838d5e06f8c56169d4e55aced1
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-13 (Sun, 13 Dec 2015)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Commit: c5054c41cf407ea50bd07de89749dbfc3052f227
https://github.com/Dolibarr/dolibarr/commit/c5054c41cf407ea50bd07de89749dbfc3052f227
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-13 (Sun, 13 Dec 2015)
Changed paths:
M htdocs/langs/en_US/trips.lang
Log Message:
-----------
Merge pull request #4211 from aspangaro/3.8-3879
Fix #3879 Wrong translation in the new expense report module
Commit: 84ee18a11b2f0c9d202d6c527e620bf1f5a03690
https://github.com/Dolibarr/dolibarr/commit/84ee18a11b2f0c9d202d6c527e620bf1f5a03690
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/card.php
Log Message:
-----------
Fix bad management of second level approvement
Commit: b9aa80c4ca915cbb29f5e35d2d6992fa9a167632
https://github.com/Dolibarr/dolibarr/commit/b9aa80c4ca915cbb29f5e35d2d6992fa9a167632
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Changed paths:
M htdocs/langs/en_US/trips.lang
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 3e3dbf850f1d9d6575057c24298d31d03f46638c
https://github.com/Dolibarr/dolibarr/commit/3e3dbf850f1d9d6575057c24298d31d03f46638c
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-15 (Tue, 15 Dec 2015)
Changed paths:
M htdocs/core/class/translate.class.php
Log Message:
-----------
Fix: bad case for function
Commit: 23e727048ef4aea9362e1742f63aa1102c09ca30
https://github.com/Dolibarr/dolibarr/commit/23e727048ef4aea9362e1742f63aa1102c09ca30
Author: BENKE Charlie <address@hidden>
Date: 2015-12-15 (Tue, 15 Dec 2015)
Changed paths:
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Add some new translations for export feature
Commit: dfbc2814e78d9c91f122b172096546ec63975d47
https://github.com/Dolibarr/dolibarr/commit/dfbc2814e78d9c91f122b172096546ec63975d47
Author: aspangaro <address@hidden>
Date: 2015-12-15 (Tue, 15 Dec 2015)
Changed paths:
M htdocs/accountancy/admin/card.php
Log Message:
-----------
Fix: Add an empty field for list of parent account - This value can be null
Commit: cb7f29b332e95df302a68ffc765643f56af30610
https://github.com/Dolibarr/dolibarr/commit/cb7f29b332e95df302a68ffc765643f56af30610
Author: Regis Houssin <address@hidden>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M htdocs/includes/adodbtime/adodb-time.inc.php
Log Message:
-----------
Fix: PHP 7 - Fatal error: 'break' not in the 'loop' or 'switch' context
Commit: 198e2cdcfa5ec2aa5a3f8426b0e0ffa8fd93f4b5
https://github.com/Dolibarr/dolibarr/commit/198e2cdcfa5ec2aa5a3f8426b0e0ffa8fd93f4b5
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M htdocs/includes/adodbtime/adodb-time.inc.php
Log Message:
-----------
Merge pull request #4237 from hregis/3.7_bug
Fix: PHP 7 - Fatal error: 'break' not in the 'loop' or 'switch' context
Commit: 1435a3eec7f4954219c3d56233f4a080ef23874c
https://github.com/Dolibarr/dolibarr/commit/1435a3eec7f4954219c3d56233f4a080ef23874c
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Merge pull request #4226 from defrance/patch-88
Fix add missing translations for export feature
Commit: 7c1fc2fee1b28a70171a334895711ed109a4abc7
https://github.com/Dolibarr/dolibarr/commit/7c1fc2fee1b28a70171a334895711ed109a4abc7
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-16 (Wed, 16 Dec 2015)
Changed paths:
M htdocs/accountancy/admin/card.php
Log Message:
-----------
Merge pull request #4233 from aspangaro/3.7-accountancy1
Fix: Accountancy Add an empty field for list of parent account - This value can
be null
Commit: e6ec797af8e90ff5ec60135122cdc8561003f425
https://github.com/Dolibarr/dolibarr/commit/e6ec797af8e90ff5ec60135122cdc8561003f425
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
M htdocs/core/modules/project/pdf/pdf_baleine.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
FIX #4242 Allow disabling dashes in documents
Commit: 02e053acc63916dc203ac16282210b40cbd0d44a
https://github.com/Dolibarr/dolibarr/commit/02e053acc63916dc203ac16282210b40cbd0d44a
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
M htdocs/core/modules/project/doc/pdf_baleine.modules.php
Log Message:
-----------
FIX #4242 Allow disabling dashes in documents
3.7 specific fix since document files have moved
Commit: 7e98cfd5b678385ef1b5e01f00a9e5cf4d7393ab
https://github.com/Dolibarr/dolibarr/commit/7e98cfd5b678385ef1b5e01f00a9e5cf4d7393ab
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
M htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
Log Message:
-----------
FIX #4242 Allow disabling dashes in documents
3.8 specific fix for new documents
Commit: 21f7271e5177316d3ed7779dbafae20ae49d5a00
https://github.com/Dolibarr/dolibarr/commit/21f7271e5177316d3ed7779dbafae20ae49d5a00
Author: fmarcet <address@hidden>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
M htdocs/contrat/class/contrat.class.php
Log Message:
-----------
FIX: Not deleting contrats on element_element table
Commit: cdc408a84cb6b02ad6ecca6486bcb3f68730a3e4
https://github.com/Dolibarr/dolibarr/commit/cdc408a84cb6b02ad6ecca6486bcb3f68730a3e4
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Fix: button "now" was not working on date using no javascript
Commit: 5f4947e3c10653b12c866bd9e7842ffb9b79c5f2
https://github.com/Dolibarr/dolibarr/commit/5f4947e3c10653b12c866bd9e7842ffb9b79c5f2
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-17 (Thu, 17 Dec 2015)
Changed paths:
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 70354def7c1c5f5dcea047f1ddf1d510b5950d88
https://github.com/Dolibarr/dolibarr/commit/70354def7c1c5f5dcea047f1ddf1d510b5950d88
Author: Regis Houssin <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M htdocs/core/ajax/row.php
Log Message:
-----------
Fix: Disable "main.inc.php" hooks with ajax return
Commit: 3d6f1d911a4c183ed15e0b144e2837f7a39f8ff5
https://github.com/Dolibarr/dolibarr/commit/3d6f1d911a4c183ed15e0b144e2837f7a39f8ff5
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
M htdocs/core/modules/project/pdf/pdf_baleine.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Merge pull request #4247 from GPCsolutions/3.6-4242
FIX #4242 Allow disabling dashes in documents
Commit: 2a137cd126deb32779d7a9f1ef03266e62d9e960
https://github.com/Dolibarr/dolibarr/commit/2a137cd126deb32779d7a9f1ef03266e62d9e960
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
M htdocs/core/modules/project/doc/pdf_baleine.modules.php
Log Message:
-----------
Merge pull request #4248 from GPCsolutions/3.7-4242
FIX #4242 Allow disabling dashes in documents
Commit: 452feca64ade01215f45ebf227db310248b13dbd
https://github.com/Dolibarr/dolibarr/commit/452feca64ade01215f45ebf227db310248b13dbd
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
Log Message:
-----------
Merge pull request #4249 from GPCsolutions/3.8-4242
FIX #4242 Allow disabling dashes in documents
Commit: 7af4d91828ede69ea215ce28714c31934cd267d4
https://github.com/Dolibarr/dolibarr/commit/7af4d91828ede69ea215ce28714c31934cd267d4
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M htdocs/contrat/class/contrat.class.php
Log Message:
-----------
Merge pull request #4251 from fmarcet/3.6
FIX: Not deleting contracts on element_element table
Commit: c215898c527a173f2ca960c8431acf2b61cfff44
https://github.com/Dolibarr/dolibarr/commit/c215898c527a173f2ca960c8431acf2b61cfff44
Author: phf <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M htdocs/commande/card.php
Log Message:
-----------
FIX label of line is set in description field if empty
Commit: eaacfabdf666bb865d50cf42eb43e279b7633f82
https://github.com/Dolibarr/dolibarr/commit/eaacfabdf666bb865d50cf42eb43e279b7633f82
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M htdocs/core/ajax/row.php
Log Message:
-----------
Merge pull request #4261 from hregis/3.8_bug
Fix: Disable "main.inc.php" hooks with ajax return
Commit: 1b67a9faf15a61552e5dd7e1bde66ffa1bfba403
https://github.com/Dolibarr/dolibarr/commit/1b67a9faf15a61552e5dd7e1bde66ffa1bfba403
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M htdocs/commande/card.php
Log Message:
-----------
Merge pull request #4262 from atm-ph/fix_3.8_create_order_from_propal
FIX label of line is set in description field if empty
Commit: aa7e74f4c866d8dcf8d3dbb976bbeb4cfbcf7d00
https://github.com/Dolibarr/dolibarr/commit/aa7e74f4c866d8dcf8d3dbb976bbeb4cfbcf7d00
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M .travis.yml
Log Message:
-----------
Try to fix travis error using the new setup
Commit: 5c8731b1974eaf3d3f5d9b295ccfab5f72ea9bb3
https://github.com/Dolibarr/dolibarr/commit/5c8731b1974eaf3d3f5d9b295ccfab5f72ea9bb3
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M htdocs/accountancy/admin/card.php
M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
M htdocs/core/modules/project/doc/pdf_baleine.modules.php
M htdocs/includes/adodbtime/adodb-time.inc.php
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
Commit: 480111c6b19ccd6ade97b4250ba23a2aedc54ef1
https://github.com/Dolibarr/dolibarr/commit/480111c6b19ccd6ade97b4250ba23a2aedc54ef1
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M .travis.yml
Log Message:
-----------
Try to fix travis error using new setup
Commit: 056ab6368029a681cbfa40222a3f2ef81559fb9a
https://github.com/Dolibarr/dolibarr/commit/056ab6368029a681cbfa40222a3f2ef81559fb9a
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M .travis.yml
Log Message:
-----------
Try to fix travis error using new setup
Commit: 0dc4130a17ecba7e2811404c7511b9972948331e
https://github.com/Dolibarr/dolibarr/commit/0dc4130a17ecba7e2811404c7511b9972948331e
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M .travis.yml
Log Message:
-----------
Add debug
Commit: 064fad136e60c741527f4f9eb048b73bdee11dac
https://github.com/Dolibarr/dolibarr/commit/064fad136e60c741527f4f9eb048b73bdee11dac
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M composer.json
Log Message:
-----------
Try to solve travis pb
Commit: 11042fe49969ff0038dfaee70141776a433bd0b5
https://github.com/Dolibarr/dolibarr/commit/11042fe49969ff0038dfaee70141776a433bd0b5
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M .travis.yml
Log Message:
-----------
Restore data missin help debug
Commit: 61df71cc6450f1c5f32cb551eaacd54728018709
https://github.com/Dolibarr/dolibarr/commit/61df71cc6450f1c5f32cb551eaacd54728018709
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M .travis.yml
Log Message:
-----------
Fix travis
Commit: b47dc8a394ac172db821d723fe17e24bed7b80ee
https://github.com/Dolibarr/dolibarr/commit/b47dc8a394ac172db821d723fe17e24bed7b80ee
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M .travis.yml
A build/travis-ci/apache.conf
Log Message:
-----------
Fix to use new travis setup
Commit: c1c0fa88c22dd5e0d2ee586ba95d550b08046620
https://github.com/Dolibarr/dolibarr/commit/c1c0fa88c22dd5e0d2ee586ba95d550b08046620
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M .travis.yml
A build/travis-ci/apache.conf
Log Message:
-----------
Fix for new travis setup
Commit: ebf68ecbe07468576ec44767b22d6afe2953b305
https://github.com/Dolibarr/dolibarr/commit/ebf68ecbe07468576ec44767b22d6afe2953b305
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M .travis.yml
M htdocs/contrat/class/contrat.class.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
M htdocs/core/modules/project/doc/pdf_baleine.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
.travis.yml
htdocs/contrat/class/contrat.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/project/pdf/pdf_baleine.modules.php
Commit: dd3f5a32d3bc9bdfee4601d8dc63882fd4c27b70
https://github.com/Dolibarr/dolibarr/commit/dd3f5a32d3bc9bdfee4601d8dc63882fd4c27b70
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M .travis.yml
A build/travis-ci/apache.conf
M composer.json
M dev/codesniffer/ruleset.xml
M htdocs/accountancy/admin/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/includes/adodbtime/adodb-time.inc.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
.travis.yml
composer.json
htdocs/accountancy/admin/card.php
Commit: f25a9030ebbedb2122fe1deb88e81fa590020293
https://github.com/Dolibarr/dolibarr/commit/f25a9030ebbedb2122fe1deb88e81fa590020293
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M .travis.yml
M dev/codesniffer/ruleset.xml
M htdocs/accountancy/admin/card.php
M htdocs/commande/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/ajax/row.php
M htdocs/core/class/html.form.class.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/card.php
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/trips.lang
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
.travis.yml
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
htdocs/includes/adodbtime/adodb-time.inc.php
htdocs/langs/en_US/accountancy.lang
Compare:
https://github.com/Dolibarr/dolibarr/compare/05ea9afa0280...f25a9030ebbe