[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] dfbc28: Fix: Add an empty field for l
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] dfbc28: Fix: Add an empty field for list of parent account... |
|
Date: |
Fri, 18 Dec 2015 12:21:10 -0800 |
Branch: refs/heads/3.8
Home: https://github.com/Dolibarr/dolibarr
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: 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: 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: 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: 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: 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
Compare:
https://github.com/Dolibarr/dolibarr/compare/1b67a9faf15a...dd3f5a32d3bc