[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 7ed496: FIX: copy extrafields when cr
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 7ed496: FIX: copy extrafields when creating order from pro... |
|
Date: |
Sat, 22 Nov 2014 07:29:17 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 7ed496d7d9e64664fa502dfa8bd6072599665702
https://github.com/Dolibarr/dolibarr/commit/7ed496d7d9e64664fa502dfa8bd6072599665702
Author: Christophe Battarel <address@hidden>
Date: 2014-11-12 (Wed, 12 Nov 2014)
Changed paths:
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
FIX: copy extrafields when creating order from propale and creating
invoice from order
Commit: ec20b38adc40a317d6cd9773dd75c20644caa1bc
https://github.com/Dolibarr/dolibarr/commit/ec20b38adc40a317d6cd9773dd75c20644caa1bc
Author: Antoine Sirinelli <address@hidden>
Date: 2014-11-16 (Sun, 16 Nov 2014)
Changed paths:
M htdocs/install/mysql/data/llx_c_forme_juridique.sql
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Add EIRL in llx_c_forme_juridique
This a not so new French type of company: Entreprise Individuelle à
Responsabilité Limitée (EIRL).
Migration script also added.
Commit: d0dc792b3cd829c6ef86fa555f880ed8400d3deb
https://github.com/Dolibarr/dolibarr/commit/d0dc792b3cd829c6ef86fa555f880ed8400d3deb
Author: Christophe Battarel <address@hidden>
Date: 2014-11-17 (Mon, 17 Nov 2014)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
check extrafields before inserting in DB
Commit: 7a7097a1065e8f78d56ed92f09ac04898fcc6536
https://github.com/Dolibarr/dolibarr/commit/7a7097a1065e8f78d56ed92f09ac04898fcc6536
Author: Raphaël Doursenaud <address@hidden>
Date: 2014-11-17 (Mon, 17 Nov 2014)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.6.0.sql
Log Message:
-----------
Work around bug #1643
Commit: 079dbf9fbdc800520cb9876ee15daf1ca6f0867c
https://github.com/Dolibarr/dolibarr/commit/079dbf9fbdc800520cb9876ee15daf1ca6f0867c
Author: Raphaël Doursenaud <address@hidden>
Date: 2014-11-17 (Mon, 17 Nov 2014)
Changed paths:
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Work around bug #1644
Commit: a82953ef70c2848bcc64daad519062ed81d1fe00
https://github.com/Dolibarr/dolibarr/commit/a82953ef70c2848bcc64daad519062ed81d1fe00
Author: aspangaro <address@hidden>
Date: 2014-11-17 (Mon, 17 Nov 2014)
Changed paths:
M htdocs/comm/list.php
Log Message:
-----------
#1681 Clear sort filter works partially in customers list
Commit: 86e624c3bc1af453e038b98aca0ab15e8cf26392
https://github.com/Dolibarr/dolibarr/commit/86e624c3bc1af453e038b98aca0ab15e8cf26392
Author: aspangaro <address@hidden>
Date: 2014-11-17 (Mon, 17 Nov 2014)
Changed paths:
M htdocs/fichinter/list.php
Log Message:
-----------
#1684 Clear sort filter works partially in interventions list
Commit: de7a38417f422c7ac01544f54fb1dfa419ea3f6c
https://github.com/Dolibarr/dolibarr/commit/de7a38417f422c7ac01544f54fb1dfa419ea3f6c
Author: aspangaro <address@hidden>
Date: 2014-11-17 (Mon, 17 Nov 2014)
Changed paths:
M htdocs/comm/propal/list.php
Log Message:
-----------
#1680 Clear sort filter works partially in prospects list
Commit: 264794ec8ce0c0fc6c18e6dcc15a902b6b11c096
https://github.com/Dolibarr/dolibarr/commit/264794ec8ce0c0fc6c18e6dcc15a902b6b11c096
Author: Frédéric FRANCE <address@hidden>
Date: 2014-11-17 (Mon, 17 Nov 2014)
Changed paths:
M htdocs/contact/list.php
Log Message:
-----------
#1664 Can't sort by mobile phones in contact list
Commit: db99b7f09af323836d1cb08afa36c91b88ba5e0f
https://github.com/Dolibarr/dolibarr/commit/db99b7f09af323836d1cb08afa36c91b88ba5e0f
Author: Frédéric FRANCE <address@hidden>
Date: 2014-11-17 (Mon, 17 Nov 2014)
Changed paths:
M htdocs/contact/list.php
Log Message:
-----------
#1665 Can't clear sort filter on contacts list
Commit: 167cf258e7460a47650f578ffc2f3db865cc7eee
https://github.com/Dolibarr/dolibarr/commit/167cf258e7460a47650f578ffc2f3db865cc7eee
Author: Frédéric FRANCE <address@hidden>
Date: 2014-11-17 (Mon, 17 Nov 2014)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
#1666 Clear sort filter works partially in product/services
Commit: f2eda0629b5815a249a97f9045ac5269fcac8a9a
https://github.com/Dolibarr/dolibarr/commit/f2eda0629b5815a249a97f9045ac5269fcac8a9a
Author: Frédéric FRANCE <address@hidden>
Date: 2014-11-17 (Mon, 17 Nov 2014)
Changed paths:
M htdocs/comm/propal/list.php
Log Message:
-----------
#1682 Date is missing in proposals list
Commit: 5536abecf795d6b7c8da62ca82194a11ed2a07fe
https://github.com/Dolibarr/dolibarr/commit/5536abecf795d6b7c8da62ca82194a11ed2a07fe
Author: Frédéric FRANCE <address@hidden>
Date: 2014-11-17 (Mon, 17 Nov 2014)
Changed paths:
M htdocs/comm/propal/list.php
Log Message:
-----------
#1683 Can't clear sort filter on proposals list
Commit: d8192d8223808252d8b0789a145eedaf30f674a1
https://github.com/Dolibarr/dolibarr/commit/d8192d8223808252d8b0789a145eedaf30f674a1
Author: Frédéric FRANCE <address@hidden>
Date: 2014-11-18 (Tue, 18 Nov 2014)
Changed paths:
M htdocs/fourn/facture/list.php
Log Message:
-----------
#1685-1686 Clear sort filter works partially in supplier invoices
Commit: e9966c50da70fcdfaf78f64f8e3ef7db95eb7f35
https://github.com/Dolibarr/dolibarr/commit/e9966c50da70fcdfaf78f64f8e3ef7db95eb7f35
Author: Frédéric FRANCE <address@hidden>
Date: 2014-11-18 (Tue, 18 Nov 2014)
Changed paths:
M htdocs/fourn/facture/paiement.php
Log Message:
-----------
#1689 Can't sort supplier invoice payments on amounts
Commit: cd3bafbef7b0661795e2371746577d64c4a8bd99
https://github.com/Dolibarr/dolibarr/commit/cd3bafbef7b0661795e2371746577d64c4a8bd99
Author: Frédéric FRANCE <address@hidden>
Date: 2014-11-18 (Tue, 18 Nov 2014)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
Update list.php
Commit: 1b077950cd2ffd628be69ed26425800db1ff9f48
https://github.com/Dolibarr/dolibarr/commit/1b077950cd2ffd628be69ed26425800db1ff9f48
Author: aspangaro <address@hidden>
Date: 2014-11-18 (Tue, 18 Nov 2014)
Changed paths:
M htdocs/langs/en_US/donations.lang
Log Message:
-----------
#1698 Untranslatable strings in donation module admin
Commit: 621f2b5c77ba00e52658d27cf4de43f4b3806527
https://github.com/Dolibarr/dolibarr/commit/621f2b5c77ba00e52658d27cf4de43f4b3806527
Author: aspangaro <address@hidden>
Date: 2014-11-18 (Tue, 18 Nov 2014)
Changed paths:
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
#1672 VAT accounts by default are lost in migration
Commit: e3edc3f690e8489f3b511f20930f95793400fbbd
https://github.com/Dolibarr/dolibarr/commit/e3edc3f690e8489f3b511f20930f95793400fbbd
Author: aspangaro <address@hidden>
Date: 2014-11-18 (Tue, 18 Nov 2014)
Changed paths:
M htdocs/fourn/facture/impayees.php
Log Message:
-----------
#1688 The ref filter searches on rowid not on ref in unpaid supplier invoices
list
Commit: 3dacdf4e4a5ff54dc7a57a262d95465fc4580569
https://github.com/Dolibarr/dolibarr/commit/3dacdf4e4a5ff54dc7a57a262d95465fc4580569
Author: Juanjo Menent <address@hidden>
Date: 2014-11-19 (Wed, 19 Nov 2014)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/product/class/product.class.php
Log Message:
-----------
Fix: Conflicts and remove duplicate code
Commit: 4d48205e45fa2c01cc334f6aa2ccc61f0dadb88d
https://github.com/Dolibarr/dolibarr/commit/4d48205e45fa2c01cc334f6aa2ccc61f0dadb88d
Author: aspangaro <address@hidden>
Date: 2014-11-20 (Thu, 20 Nov 2014)
Changed paths:
M htdocs/fichinter/apercu.php
Log Message:
-----------
#1657 Intervention preview date is not displayed
Commit: 0ec30ea8c02ea5c35bcde1e3d3d62220c1ffcb47
https://github.com/Dolibarr/dolibarr/commit/0ec30ea8c02ea5c35bcde1e3d3d62220c1ffcb47
Author: aspangaro <address@hidden>
Date: 2014-11-20 (Thu, 20 Nov 2014)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge remote-tracking branch 'Upstream/3.7' into 1657
Commit: 01a5f22f4a42009c053614af438dc51447726d2a
https://github.com/Dolibarr/dolibarr/commit/01a5f22f4a42009c053614af438dc51447726d2a
Author: aspangaro <address@hidden>
Date: 2014-11-20 (Thu, 20 Nov 2014)
Changed paths:
M htdocs/externalsite/admin/externalsite.php
M htdocs/langs/en_US/externalsite.lang
Log Message:
-----------
#1704 Untranslatable token in externalsite module admin
Commit: 4b229dabfd9e84ed0d64aad6931a54b124a606aa
https://github.com/Dolibarr/dolibarr/commit/4b229dabfd9e84ed0d64aad6931a54b124a606aa
Author: aspangaro <address@hidden>
Date: 2014-11-20 (Thu, 20 Nov 2014)
Changed paths:
M htdocs/expedition/list.php
Log Message:
-----------
#1706 Missing table cell in shipment list header + Search fields doesn't work
Commit: d6f47227fe3b01bf4b00bf981dd8cd091bfe669b
https://github.com/Dolibarr/dolibarr/commit/d6f47227fe3b01bf4b00bf981dd8cd091bfe669b
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/compta/facture/impayees.php
Log Message:
-----------
Fixed: [ bug #1646 ] Can't list unpaid invoices
Commit: 43f3e28fd630a1b95a7ca8a78b7497e8cccf5446
https://github.com/Dolibarr/dolibarr/commit/43f3e28fd630a1b95a7ca8a78b7497e8cccf5446
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/contrat/list.php
Log Message:
-----------
Fixed: [ bug #1645 ] Can't list contracts
Commit: b5e64b66c8cc3ca979d76d6af9951a4157804e28
https://github.com/Dolibarr/dolibarr/commit/b5e64b66c8cc3ca979d76d6af9951a4157804e28
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.6.0.sql
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Merge pull request #2025 from GPCsolutions/dbupgrade
Work around tms bugs with MariaDB
Commit: 088dd1d2e99dbf01b0b6c6e5a35ecb7aecd6b34d
https://github.com/Dolibarr/dolibarr/commit/088dd1d2e99dbf01b0b6c6e5a35ecb7aecd6b34d
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/compta/facture/impayees.php
M htdocs/contrat/list.php
M htdocs/install/pgsql/functions/functions.sql
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
Commit: 4b2e0b555a4b59aad449c707dac7422fdb4fd74b
https://github.com/Dolibarr/dolibarr/commit/4b2e0b555a4b59aad449c707dac7422fdb4fd74b
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/expedition/list.php
Log Message:
-----------
Merge pull request #2062 from aspangaro/1706
#1706 Missing table cell in shipment list header + Search fields doesn't...
Commit: 135e58871e2be316431e3998aadac581051604d6
https://github.com/Dolibarr/dolibarr/commit/135e58871e2be316431e3998aadac581051604d6
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/externalsite/admin/externalsite.php
M htdocs/langs/en_US/externalsite.lang
Log Message:
-----------
Merge pull request #2061 from aspangaro/1704
#1704 Untranslatable token in externalsite module admin
Commit: f0d32e3b654650c47ecf7c35e3a3ddff3fe52008
https://github.com/Dolibarr/dolibarr/commit/f0d32e3b654650c47ecf7c35e3a3ddff3fe52008
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/fichinter/apercu.php
Log Message:
-----------
Merge pull request #2059 from aspangaro/1657
#1657 Intervention preview date is not displayed
Commit: eaa4b6cb56a9de31d37352e6540adb698b0e9e58
https://github.com/Dolibarr/dolibarr/commit/eaa4b6cb56a9de31d37352e6540adb698b0e9e58
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/compta/paiement/cheque/index.php
Log Message:
-----------
Add PR manually because of conflict "#1678 & #1677 Untranslatable token"
Commit: a47c7f02e27a6fc93dda7e84ada1f5864d98a80e
https://github.com/Dolibarr/dolibarr/commit/a47c7f02e27a6fc93dda7e84ada1f5864d98a80e
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/expedition/list.php
M htdocs/externalsite/admin/externalsite.php
M htdocs/fichinter/apercu.php
M htdocs/langs/en_US/externalsite.lang
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
Commit: 730bf1c25cf77b48f60b3b18114e83f8a78561d9
https://github.com/Dolibarr/dolibarr/commit/730bf1c25cf77b48f60b3b18114e83f8a78561d9
Author: BENKE Charles <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/core/class/html.formcontract.class.php
Log Message:
-----------
Update html.formcontract.class.php
bad filtering on contract list (same sql rule as project)
Commit: 7fbeb2cbcb2760df8576ec88d1da539b4e5eec62
https://github.com/Dolibarr/dolibarr/commit/7fbeb2cbcb2760df8576ec88d1da539b4e5eec62
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/fourn/facture/impayees.php
Log Message:
-----------
Merge pull request #2053 from aspangaro/1688
#1688 The ref filter searches on rowid not on ref in unpaid supplier inv...
Commit: dfae42cd4aa233595a7f980110cb74c887fd43f1
https://github.com/Dolibarr/dolibarr/commit/dfae42cd4aa233595a7f980110cb74c887fd43f1
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Merge pull request #2051 from aspangaro/1690
#1672 VAT accounts by default are lost in migration
Commit: b9cf6ddd654aabf47c2394db079402435a8c774b
https://github.com/Dolibarr/dolibarr/commit/b9cf6ddd654aabf47c2394db079402435a8c774b
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/langs/en_US/donations.lang
Log Message:
-----------
Merge branch '1698' of github.com:aspangaro/dolibarr into aspangaro-1698
Conflicts:
htdocs/langs/en_US/donations.lang
Commit: 5afc509d5f70a1be198f71334c0dc0cafdf3cac3
https://github.com/Dolibarr/dolibarr/commit/5afc509d5f70a1be198f71334c0dc0cafdf3cac3
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/langs/en_US/donations.lang
Log Message:
-----------
Merge branch 'aspangaro-1698' into 3.7
Commit: a6867fef0f4ed85f2615067232066acafc14812f
https://github.com/Dolibarr/dolibarr/commit/a6867fef0f4ed85f2615067232066acafc14812f
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/fourn/facture/impayees.php
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
Commit: 8c440dea4aeabdc38d8463f8f1571f76da1a1538
https://github.com/Dolibarr/dolibarr/commit/8c440dea4aeabdc38d8463f8f1571f76da1a1538
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/product/card.php
Log Message:
-----------
Fxied: Syntax error
Commit: d6cb29a17b162b0a756cecb9dbdc55bab622ebd9
https://github.com/Dolibarr/dolibarr/commit/d6cb29a17b162b0a756cecb9dbdc55bab622ebd9
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/fourn/facture/paiement.php
Log Message:
-----------
Merge pull request #2048 from frederic34/patch-7
#1689 Can't sort supplier invoice payments on amounts
Commit: 830d470c33bbc2b6dcc7f8c593c2c2b9625ca869
https://github.com/Dolibarr/dolibarr/commit/830d470c33bbc2b6dcc7f8c593c2c2b9625ca869
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/fourn/facture/list.php
Log Message:
-----------
Merge pull request #2047 from frederic34/patch-6
#1685-1686 Clear sort filter works partially in supplier invoices
Commit: e4804f99ff62d5a385450444359fdec31653b9fc
https://github.com/Dolibarr/dolibarr/commit/e4804f99ff62d5a385450444359fdec31653b9fc
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/fourn/facture/list.php
Log Message:
-----------
Merge pull request #2047 from frederic34/patch-6
#1685-1686 Clear sort filter works partially in supplier invoices
Commit: 86f2f191ea4cfcd3f93fef166e3a389f655b94c1
https://github.com/Dolibarr/dolibarr/commit/86f2f191ea4cfcd3f93fef166e3a389f655b94c1
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/comm/propal/list.php
Log Message:
-----------
Merge pull request #2046 from frederic34/patch-5
#1683 Can't clear sort filter on proposals list
Commit: 6c7bab8d8c56b8aed88d3e6485d184d4f06b7a0e
https://github.com/Dolibarr/dolibarr/commit/6c7bab8d8c56b8aed88d3e6485d184d4f06b7a0e
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/comm/propal/list.php
Log Message:
-----------
Merge pull request #2045 from frederic34/patch-4
#1682 Date is missing in proposals list
Commit: a7df54ef0dac52378d14c3b5d2962545f0fcbd26
https://github.com/Dolibarr/dolibarr/commit/a7df54ef0dac52378d14c3b5d2962545f0fcbd26
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
Merge pull request #2044 from frederic34/patch-3
#1666 Clear sort filter works partially in product/services
Commit: d7b0aab71ae8c4624f9e249bf422aa04fa6974e3
https://github.com/Dolibarr/dolibarr/commit/d7b0aab71ae8c4624f9e249bf422aa04fa6974e3
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
Clear works with all browsers
Commit: 0e44e0560089a883b6976cc21812848d8f728e41
https://github.com/Dolibarr/dolibarr/commit/0e44e0560089a883b6976cc21812848d8f728e41
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/contact/list.php
Log Message:
-----------
Merge pull request #2043 from frederic34/patch-2
#1665 Can't clear sort filter on contacts list
Commit: d3e216c19a3386e686bffe1f7dacad1c802034a6
https://github.com/Dolibarr/dolibarr/commit/d3e216c19a3386e686bffe1f7dacad1c802034a6
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/contact/list.php
Log Message:
-----------
Clear compatible with all browsers
Commit: 9ddb76ca1216afcfc4a89099b38d26bfd5ca0771
https://github.com/Dolibarr/dolibarr/commit/9ddb76ca1216afcfc4a89099b38d26bfd5ca0771
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/contact/list.php
Log Message:
-----------
Merge pull request #2042 from frederic34/patch-9
#1664 Can't sort by mobile phones in contact list
Commit: 34306359a4c8592062bc8fdb68839f2c30840321
https://github.com/Dolibarr/dolibarr/commit/34306359a4c8592062bc8fdb68839f2c30840321
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/contact/list.php
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
Commit: 432b623dac01c900c9c0031e79afa8ab969dcade
https://github.com/Dolibarr/dolibarr/commit/432b623dac01c900c9c0031e79afa8ab969dcade
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/fichinter/list.php
Log Message:
-----------
Merge pull request #2041 from aspangaro/1684
#1684 Clear sort filter works partially in interventions list
Commit: e6e5cb471d8306e62148d30576dfbda9044e645b
https://github.com/Dolibarr/dolibarr/commit/e6e5cb471d8306e62148d30576dfbda9044e645b
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/comm/list.php
Log Message:
-----------
Merge pull request #2040 from aspangaro/1681
#1681 Clear sort filter works partially in customers list
Commit: 86a3a4f6181927fb5d88379325f92e91fdaa71c3
https://github.com/Dolibarr/dolibarr/commit/86a3a4f6181927fb5d88379325f92e91fdaa71c3
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/comm/propal/list.php
Log Message:
-----------
Merge branch '1680' of github.com:aspangaro/dolibarr into aspangaro-1680
Conflicts:
htdocs/comm/propal/list.php
Commit: b686789a3187328e9f4d65521be07339af02ad2a
https://github.com/Dolibarr/dolibarr/commit/b686789a3187328e9f4d65521be07339af02ad2a
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/comm/propal/list.php
Log Message:
-----------
Merge branch 'aspangaro-1680' into 3.7
Commit: e8b2206629dd6646763f8a454e6773cd7bab73d5
https://github.com/Dolibarr/dolibarr/commit/e8b2206629dd6646763f8a454e6773cd7bab73d5
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/comm/list.php
M htdocs/fichinter/list.php
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
Commit: 667f1bf49794e7ebae7dfd50020d5cd3d2b8df0d
https://github.com/Dolibarr/dolibarr/commit/667f1bf49794e7ebae7dfd50020d5cd3d2b8df0d
Author: Andrelec1 <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/holiday/card.php
M htdocs/holiday/class/holiday.class.php
Log Message:
-----------
Fix : more than 1000 holidays
Si il y a plus de 1000 jours de congés, le délimiteur des millier fais
bugger les calcule ...
Commit: 31a5a46ffa0ef5eec3aca24d59e294fc8a18c320
https://github.com/Dolibarr/dolibarr/commit/31a5a46ffa0ef5eec3aca24d59e294fc8a18c320
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/install/mysql/data/llx_c_forme_juridique.sql
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Merge pull request #2022 from asirinelli/3.7
Add EIRL in llx_c_forme_juridique
Commit: 2f4de2ef75b5feda7efe1f3f0bb7328f788b6400
https://github.com/Dolibarr/dolibarr/commit/2f4de2ef75b5feda7efe1f3f0bb7328f788b6400
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge pull request #2016 from altatof/3.5
FIX: copy extrafields when creating order from propale and creating
Commit: 9aab62ab36d4367f3a58b3e6edae408109e4f5d5
https://github.com/Dolibarr/dolibarr/commit/9aab62ab36d4367f3a58b3e6edae408109e4f5d5
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Commit: d8767bfbae9c2ac230d49f33c2369305324c5e48
https://github.com/Dolibarr/dolibarr/commit/d8767bfbae9c2ac230d49f33c2369305324c5e48
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/product/class/product.class.php
Commit: 02e18bc03d516e8fe1e400acb48c4241e6efc9c7
https://github.com/Dolibarr/dolibarr/commit/02e18bc03d516e8fe1e400acb48c4241e6efc9c7
Author: Laurent Destailleur <address@hidden>
Date: 2014-11-22 (Sat, 22 Nov 2014)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.6.0.sql
M htdocs/comm/list.php
M htdocs/comm/propal/list.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/impayees.php
M htdocs/compta/paiement/cheque/index.php
M htdocs/contact/list.php
M htdocs/contrat/list.php
M htdocs/core/class/commonobject.class.php
M htdocs/expedition/list.php
M htdocs/externalsite/admin/externalsite.php
M htdocs/fichinter/apercu.php
M htdocs/fichinter/list.php
M htdocs/fourn/facture/impayees.php
M htdocs/fourn/facture/list.php
M htdocs/fourn/facture/paiement.php
M htdocs/install/mysql/data/llx_c_forme_juridique.sql
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
M htdocs/install/pgsql/functions/functions.sql
M htdocs/langs/en_US/donations.lang
M htdocs/langs/en_US/externalsite.lang
M htdocs/product/card.php
M htdocs/product/list.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/8b545af325c9...02e18bc03d51