[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] da51a2: Fix : situation percent shoul
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] da51a2: Fix : situation percent should be 100 by default |
|
Date: |
Thu, 31 Dec 2015 05:57:01 -0800 |
Branch: refs/heads/3.8_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: da51a2876625d33df66ae4037988dd6f1da8eb0a
https://github.com/Dolibarr/dolibarr/commit/da51a2876625d33df66ae4037988dd6f1da8eb0a
Author: Maxime Kohlhaas <address@hidden>
Date: 2015-11-23 (Mon, 23 Nov 2015)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Fix : situation percent should be 100 by default
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: 41cdb65521cb2cbea078a5c9614284575e21fd13
https://github.com/Dolibarr/dolibarr/commit/41cdb65521cb2cbea078a5c9614284575e21fd13
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-18 (Fri, 18 Dec 2015)
Changed paths:
M test/phpunit/WebservicesProductsTest.php
Log Message:
-----------
Test to solve travis error
Commit: a136e90749812163b7464efae9d2aecfb27ec1d5
https://github.com/Dolibarr/dolibarr/commit/a136e90749812163b7464efae9d2aecfb27ec1d5
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-19 (Sat, 19 Dec 2015)
Changed paths:
M .travis.yml
M htdocs/filefunc.inc.php
M test/phpunit/AllTests.php
M test/phpunit/WebservicesProductsTest.php
Log Message:
-----------
Fix travis
Commit: 0df45f10c15bbcdbd10c755f3f5c85664a7337bd
https://github.com/Dolibarr/dolibarr/commit/0df45f10c15bbcdbd10c755f3f5c85664a7337bd
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-19 (Sat, 19 Dec 2015)
Changed paths:
M .travis.yml
M htdocs/filefunc.inc.php
Log Message:
-----------
Fix travis
Commit: b1b2038d71033771263b8d8b63888c2d0b89ecad
https://github.com/Dolibarr/dolibarr/commit/b1b2038d71033771263b8d8b63888c2d0b89ecad
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-19 (Sat, 19 Dec 2015)
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Commit: 6ed87f43de65f973923be00d14b9fac7bbc3e945
https://github.com/Dolibarr/dolibarr/commit/6ed87f43de65f973923be00d14b9fac7bbc3e945
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-19 (Sat, 19 Dec 2015)
Changed paths:
M .travis.yml
Log Message:
-----------
Fix indent
Commit: 298396a57e53c20e755bea0fdf004704255dfd58
https://github.com/Dolibarr/dolibarr/commit/298396a57e53c20e755bea0fdf004704255dfd58
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-19 (Sat, 19 Dec 2015)
Changed paths:
M .travis.yml
M htdocs/filefunc.inc.php
M test/phpunit/AllTests.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
test/phpunit/AllTests.php
Commit: ba9796a438800f43d3c8c85d278cb9f5abc2d980
https://github.com/Dolibarr/dolibarr/commit/ba9796a438800f43d3c8c85d278cb9f5abc2d980
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-19 (Sat, 19 Dec 2015)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Merge pull request #4082 from atm-maxime/fix_situation_percent
Fix : situation percent should be 100 by default
Commit: 9334cf8fd189e31509452f8d1b9483b7e3bbf367
https://github.com/Dolibarr/dolibarr/commit/9334cf8fd189e31509452f8d1b9483b7e3bbf367
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-19 (Sat, 19 Dec 2015)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/product/ajax/products.php
M htdocs/product/class/product.class.php
Log Message:
-----------
FIX #4243 sql injection
Commit: b0b5e95c7fd060786fa42caebd7b75378dbc6353
https://github.com/Dolibarr/dolibarr/commit/b0b5e95c7fd060786fa42caebd7b75378dbc6353
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-21 (Mon, 21 Dec 2015)
Changed paths:
M .travis.yml
Log Message:
-----------
Backport travis change
Commit: 67462a81a8a60fd22f1b76ed45156747118baf10
https://github.com/Dolibarr/dolibarr/commit/67462a81a8a60fd22f1b76ed45156747118baf10
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-21 (Mon, 21 Dec 2015)
Changed paths:
M composer.json
Log Message:
-----------
Fix link to issues and dependencies
Commit: 96b6f0d8fb6e9538af156d4f10c6c8709818d04c
https://github.com/Dolibarr/dolibarr/commit/96b6f0d8fb6e9538af156d4f10c6c8709818d04c
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-21 (Mon, 21 Dec 2015)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/product/ajax/products.php
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
composer.json
htdocs/product/ajax/products.php
htdocs/product/class/product.class.php
Commit: 7e03aaee231a7eb920d787263f253daefdaa1d11
https://github.com/Dolibarr/dolibarr/commit/7e03aaee231a7eb920d787263f253daefdaa1d11
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-21 (Mon, 21 Dec 2015)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/product/ajax/products.php
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Commit: 932c3f91722c5478708f4b76611c0b601bb2913c
https://github.com/Dolibarr/dolibarr/commit/932c3f91722c5478708f4b76611c0b601bb2913c
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-21 (Mon, 21 Dec 2015)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Fix init of situation_percent
Commit: 2d3915b88c1dd0ecd05eafac93d753c30417f039
https://github.com/Dolibarr/dolibarr/commit/2d3915b88c1dd0ecd05eafac93d753c30417f039
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-23 (Wed, 23 Dec 2015)
Changed paths:
M htdocs/margin/tabs/thirdpartyMargins.php
M htdocs/societe/notify/card.php
M htdocs/societe/price.php
Log Message:
-----------
Fix hook implementation on some thirdparty pages
Commit: d30c64413db0d610bb7974bc1d8c35995785b7c1
https://github.com/Dolibarr/dolibarr/commit/d30c64413db0d610bb7974bc1d8c35995785b7c1
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-12-24 (Thu, 24 Dec 2015)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
FIX #4055 SQL error when trying to access a non-existing expedition
Commit: 8b633aee66978bd4333bc3ed909c2bda2ec4a97a
https://github.com/Dolibarr/dolibarr/commit/8b633aee66978bd4333bc3ed909c2bda2ec4a97a
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-12-24 (Thu, 24 Dec 2015)
Changed paths:
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/rappro.php
Log Message:
-----------
FIX #4182 SQL error when deleting an unexisting bank entry
Commit: de1625b9de47796f47283a6503faa89d01efe6ea
https://github.com/Dolibarr/dolibarr/commit/de1625b9de47796f47283a6503faa89d01efe6ea
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-12-24 (Thu, 24 Dec 2015)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
FIX #4285 SQL query shown when accessing an unexisting invoice
Commit: c9e8c362a57af7f3a973f03876abf605302bbede
https://github.com/Dolibarr/dolibarr/commit/c9e8c362a57af7f3a973f03876abf605302bbede
Author: Juanjo Menent <address@hidden>
Date: 2015-12-24 (Thu, 24 Dec 2015)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Merge pull request #4286 from marcosgdf/bug-4055
FIX #4055 SQL error when trying to access a non-existing expedition
Commit: d4466a652a16b808524d17d7553952c6cecac7d4
https://github.com/Dolibarr/dolibarr/commit/d4466a652a16b808524d17d7553952c6cecac7d4
Author: Juanjo Menent <address@hidden>
Date: 2015-12-24 (Thu, 24 Dec 2015)
Changed paths:
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/rappro.php
Log Message:
-----------
Merge pull request #4288 from marcosgdf/bug-4182
FIX #4182 SQL error when deleting an unexisting bank entry
Commit: c6093fff3e23932da48069da96a57a1cad61386d
https://github.com/Dolibarr/dolibarr/commit/c6093fff3e23932da48069da96a57a1cad61386d
Author: Juanjo Menent <address@hidden>
Date: 2015-12-24 (Thu, 24 Dec 2015)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Merge pull request #4289 from marcosgdf/bug-4285
FIX #4285 SQL query shown when accessing an unexisting invoice
Commit: da959c5cf0eb02428e7dc46df6656cef84d59f9e
https://github.com/Dolibarr/dolibarr/commit/da959c5cf0eb02428e7dc46df6656cef84d59f9e
Author: Marcos García <address@hidden>
Date: 2015-12-25 (Fri, 25 Dec 2015)
Changed paths:
M htdocs/compta/bank/rappro.php
Log Message:
-----------
Little typo in commit 8b633ae
Commit: 686348a0d6b9a7ca62bea8ea9c4f670a01974703
https://github.com/Dolibarr/dolibarr/commit/686348a0d6b9a7ca62bea8ea9c4f670a01974703
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-12-25 (Fri, 25 Dec 2015)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
FIX #4287 SQL error when accessing an unexisting proposal
Commit: 67bdfa26173ecf8c1a938531c6451de39c2ecd67
https://github.com/Dolibarr/dolibarr/commit/67bdfa26173ecf8c1a938531c6451de39c2ecd67
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
FIX #4282 Defined shipping time were not shown in Customer order's PDF
documents
Commit: 98351d6fec2a8caef0ed20c6253ec198c5bb2a45
https://github.com/Dolibarr/dolibarr/commit/98351d6fec2a8caef0ed20c6253ec198c5bb2a45
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
FIX #4302 Undefined variable $conf in Commande::LibStatut
Commit: c40c695d20596a215a5ba1f44deef5f352bafaad
https://github.com/Dolibarr/dolibarr/commit/c40c695d20596a215a5ba1f44deef5f352bafaad
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M htdocs/core/class/dolprintipp.class.php
Log Message:
-----------
FIX #4036 Direct printing module without any driver configured, shows an
unformatted error message
Commit: ebdaf7dfa6314fe59db3ab6fe91bd7a39f71334f
https://github.com/Dolibarr/dolibarr/commit/ebdaf7dfa6314fe59db3ab6fe91bd7a39f71334f
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M htdocs/fourn/product/list.php
Log Message:
-----------
FIX #3980 Search field in "product by supplier" list sends empty result 3.8
and 3.7
Commit: 68ee48291566d5231c58d905ed014384a59931b6
https://github.com/Dolibarr/dolibarr/commit/68ee48291566d5231c58d905ed014384a59931b6
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M htdocs/compta/bank/rappro.php
Log Message:
-----------
Merge pull request #4293 from marcosgdf/patch-2
Little typo in commit 8b633ae
Commit: 299e34f3ee9de5eee8c92b344a726fbfcd6cb33b
https://github.com/Dolibarr/dolibarr/commit/299e34f3ee9de5eee8c92b344a726fbfcd6cb33b
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Merge pull request #4294 from marcosgdf/bug-4287
FIX #4287 SQL error when accessing an unexisting proposal
Commit: ff6dc32827b2d35a29dc0b519b85acf3460b900c
https://github.com/Dolibarr/dolibarr/commit/ff6dc32827b2d35a29dc0b519b85acf3460b900c
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Merge pull request #4303 from marcosgdf/bug-4282
FIX #4282 Defined shipping time were not shown in Customer order's PDF documents
Commit: 80989fd2c978a38c60ad32822aaa8ff4a50a00ba
https://github.com/Dolibarr/dolibarr/commit/80989fd2c978a38c60ad32822aaa8ff4a50a00ba
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Merge pull request #4304 from marcosgdf/bug-4302
FIX #4302 Undefined variable $conf in Commande::LibStatut
Commit: 5afed31265dfd17e99b67d36727226f9cf0e9887
https://github.com/Dolibarr/dolibarr/commit/5afed31265dfd17e99b67d36727226f9cf0e9887
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M htdocs/core/class/dolprintipp.class.php
Log Message:
-----------
Merge pull request #4305 from marcosgdf/bug-4036
FIX #4036 Direct printing module without any driver configured, shows an
unformatted error message
Commit: 70b73f2d519abec362efba96803c6f4d1301a66e
https://github.com/Dolibarr/dolibarr/commit/70b73f2d519abec362efba96803c6f4d1301a66e
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M htdocs/fourn/product/list.php
Log Message:
-----------
Merge pull request #4306 from marcosgdf/bug-3980
FIX #3980 Search field in "product by supplier" list sends empty result 3.8 and
3.7
Commit: 97030b05ce11537d848267e04bc84bdc6ad604ba
https://github.com/Dolibarr/dolibarr/commit/97030b05ce11537d848267e04bc84bdc6ad604ba
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
FIX #4281
Commit: 46d122c43af864969bfe82ab41b6146a8b285bc4
https://github.com/Dolibarr/dolibarr/commit/46d122c43af864969bfe82ab41b6146a8b285bc4
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/rappro.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/class/dolprintipp.class.php
M htdocs/core/class/html.form.class.php
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 96bc2023f32db2299f02dcd8c42ea5b5a8585f91
https://github.com/Dolibarr/dolibarr/commit/96bc2023f32db2299f02dcd8c42ea5b5a8585f91
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M build/debian/changelog
M build/makepack-dolibarr.pl
M build/makepack-howto.txt
M htdocs/filefunc.inc.php
Log Message:
-----------
Prepare package 3.6.6
Commit: 06754068ffb1561ff4ec832e7389393d29900521
https://github.com/Dolibarr/dolibarr/commit/06754068ffb1561ff4ec832e7389393d29900521
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M build/debian/changelog
M build/makepack-dolibarr.pl
M build/makepack-howto.txt
M htdocs/filefunc.inc.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
build/debian/changelog
build/makepack-dolibarr.pl
build/makepack-howto.txt
htdocs/filefunc.inc.php
Commit: e536e102695273e1b76a44a2756f0f0ad2c0a989
https://github.com/Dolibarr/dolibarr/commit/e536e102695273e1b76a44a2756f0f0ad2c0a989
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M build/makepack-dolibarr.pl
M build/makepack-howto.txt
M htdocs/filefunc.inc.php
M htdocs/fourn/product/list.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
build/makepack-howto.txt
htdocs/filefunc.inc.php
Commit: 69058427944742700efd4a3e9601f433411f2e5f
https://github.com/Dolibarr/dolibarr/commit/69058427944742700efd4a3e9601f433411f2e5f
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M htdocs/public/demo/index.php
Log Message:
-----------
Update list of module in demo with new 3.8 modules
Commit: a2e93056f7eeeb18720126388944a2ad10216a5f
https://github.com/Dolibarr/dolibarr/commit/a2e93056f7eeeb18720126388944a2ad10216a5f
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Prepare 3.8.3
Commit: cfd01b6060372391aad7166b6963de80227b756b
https://github.com/Dolibarr/dolibarr/commit/cfd01b6060372391aad7166b6963de80227b756b
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-27 (Sun, 27 Dec 2015)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Fix package for 3.8.3
Commit: b05ca8ae7212d5d93e31c80833fdd5613948a1b5
https://github.com/Dolibarr/dolibarr/commit/b05ca8ae7212d5d93e31c80833fdd5613948a1b5
Author: bobby <address@hidden>
Date: 2015-12-28 (Mon, 28 Dec 2015)
Changed paths:
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/productaccount.php
M htdocs/accountancy/bookkeeping/card.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/bookkeeping/listbyyear.php
M htdocs/accountancy/customer/lines.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/supplier/lines.php
M htdocs/accountancy/supplier/list.php
Log Message:
-----------
Merge accountacy from 3.9 (develop)
Commit: a8683b1acca9b380dc279aced14ebf698bc3d483
https://github.com/Dolibarr/dolibarr/commit/a8683b1acca9b380dc279aced14ebf698bc3d483
Author: bobby <address@hidden>
Date: 2015-12-28 (Mon, 28 Dec 2015)
Log Message:
-----------
Merge branch '3.8_backported' of address@hidden:Dolibarr/dolibarr.git into
3.8_backported
Commit: 7e84e534284c874c0e4ad1f153b82aaeacae3ccb
https://github.com/Dolibarr/dolibarr/commit/7e84e534284c874c0e4ad1f153b82aaeacae3ccb
Author: bobby <address@hidden>
Date: 2015-12-28 (Mon, 28 Dec 2015)
Changed paths:
M .travis.yml
M ChangeLog
M build/makepack-dolibarr.pl
M build/makepack-howto.txt
A build/travis-ci/apache.conf
M composer.json
M dev/codesniffer/ruleset.xml
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/rappro.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/ajax/row.php
M htdocs/core/class/dolprintipp.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/translate.class.php
M htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.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/expedition/class/expedition.class.php
M htdocs/filefunc.inc.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/product/list.php
M htdocs/includes/adodbtime/adodb-time.inc.php
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/trips.lang
M htdocs/margin/tabs/thirdpartyMargins.php
M htdocs/product/ajax/products.php
M htdocs/product/class/product.class.php
M htdocs/product/list.php
M htdocs/public/demo/index.php
M htdocs/societe/notify/card.php
M htdocs/societe/price.php
M test/phpunit/AllTests.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.8_backported
Conflicts:
htdocs/accountancy/admin/card.php
htdocs/langs/en_US/accountancy.lang
Commit: 1ff8f21d4d47acc790dd026116143f88f56af9a0
https://github.com/Dolibarr/dolibarr/commit/1ff8f21d4d47acc790dd026116143f88f56af9a0
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-31 (Thu, 31 Dec 2015)
Changed paths:
M .travis.yml
M ChangeLog
M build/makepack-dolibarr.pl
M build/makepack-howto.txt
A build/travis-ci/apache.conf
M composer.json
M dev/codesniffer/ruleset.xml
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/productaccount.php
M htdocs/accountancy/bookkeeping/card.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/bookkeeping/listbyyear.php
M htdocs/accountancy/customer/lines.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/supplier/lines.php
M htdocs/accountancy/supplier/list.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/rappro.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/ajax/row.php
M htdocs/core/class/dolprintipp.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/translate.class.php
M htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.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/expedition/class/expedition.class.php
M htdocs/filefunc.inc.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/product/list.php
M htdocs/includes/adodbtime/adodb-time.inc.php
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/trips.lang
M htdocs/margin/tabs/thirdpartyMargins.php
M htdocs/product/ajax/products.php
M htdocs/product/class/product.class.php
M htdocs/product/list.php
M htdocs/public/demo/index.php
M htdocs/societe/notify/card.php
M htdocs/societe/price.php
M test/phpunit/AllTests.php
Log Message:
-----------
Merge pull request #4312 from FHenry/3.8_backported
Merge from 3.8 and accountancy working
Compare:
https://github.com/Dolibarr/dolibarr/compare/d853b83bfd77...1ff8f21d4d47