[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 0f0db5: fix: uniformize
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 0f0db5: fix: uniformize |
|
Date: |
Sun, 18 Dec 2016 02:58:00 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 0f0db5a3fb7bc70cb10ee0d64e468a7c252ee420
https://github.com/Dolibarr/dolibarr/commit/0f0db5a3fb7bc70cb10ee0d64e468a7c252ee420
Author: florian HENRY <address@hidden>
Date: 2016-12-10 (Sat, 10 Dec 2016)
Changed paths:
M htdocs/core/ajax/bankconciliate.php
Log Message:
-----------
fix: uniformize
Commit: 337509d40f7b08bd46aca6156b1275e7430077ee
https://github.com/Dolibarr/dolibarr/commit/337509d40f7b08bd46aca6156b1275e7430077ee
Author: Regis Houssin <address@hidden>
Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths:
M htdocs/core/class/commondocgenerator.class.php
Log Message:
-----------
Fix: missing date locale and date rfc
Commit: 3992a92dd4063f3712cc855b85f5ce04d5273dc8
https://github.com/Dolibarr/dolibarr/commit/3992a92dd4063f3712cc855b85f5ce04d5273dc8
Author: florian HENRY <address@hidden>
Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths:
M ChangeLog
M htdocs/compta/localtax/clients.php
M htdocs/core/class/extrafields.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/product/card.php
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0
Commit: cb21ad2cc5bc0ed1af624be7c874a25fde835822
https://github.com/Dolibarr/dolibarr/commit/cb21ad2cc5bc0ed1af624be7c874a25fde835822
Author: Regis Houssin <address@hidden>
Date: 2016-12-13 (Tue, 13 Dec 2016)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/4.0' into 4.0_bug
Commit: 2777c4d4a5ec16142c4ae0317f1d7227f4b4e31c
https://github.com/Dolibarr/dolibarr/commit/2777c4d4a5ec16142c4ae0317f1d7227f4b4e31c
Author: Ferran Marcet <address@hidden>
Date: 2016-12-14 (Wed, 14 Dec 2016)
Changed paths:
M htdocs/supplier_proposal/class/supplier_proposal.class.php
Log Message:
-----------
FIX: Setting supplier as client when accept a supplier proposal
Commit: d8e394d3aa0ccd63fe2c0e58b79810e5ead69760
https://github.com/Dolibarr/dolibarr/commit/d8e394d3aa0ccd63fe2c0e58b79810e5ead69760
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-16 (Fri, 16 Dec 2016)
Changed paths:
M htdocs/core/modules/modProjet.class.php
Log Message:
-----------
FIX Missing field
Commit: c5db333af8b6b59cb4943647f64cc47d2618ce1d
https://github.com/Dolibarr/dolibarr/commit/c5db333af8b6b59cb4943647f64cc47d2618ce1d
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-17 (Sat, 17 Dec 2016)
Changed paths:
M htdocs/core/class/CMailFile.class.php
M htdocs/langs/en_US/errors.lang
Log Message:
-----------
Fix translation of error message when sending email
Commit: 73e666323065f642e8b8aabc2f5b1c4379b9881b
https://github.com/Dolibarr/dolibarr/commit/73e666323065f642e8b8aabc2f5b1c4379b9881b
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-17 (Sat, 17 Dec 2016)
Changed paths:
M htdocs/comm/mailing/card.php
M htdocs/langs/en_US/mails.lang
Log Message:
-----------
Fix help/messages for emailing to warn users.
Commit: 321933f2671fbc26c09160144fefa07ea35f1649
https://github.com/Dolibarr/dolibarr/commit/321933f2671fbc26c09160144fefa07ea35f1649
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-18 (Sun, 18 Dec 2016)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
Fix deletion of product
Commit: 6830fdca980ac2b8c7594b78994288c4bc0be90e
https://github.com/Dolibarr/dolibarr/commit/6830fdca980ac2b8c7594b78994288c4bc0be90e
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-18 (Sun, 18 Dec 2016)
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.9
Conflicts:
htdocs/product/class/product.class.php
Commit: 394e284a4a2a9a1d28c285204b385a13eef5a79a
https://github.com/Dolibarr/dolibarr/commit/394e284a4a2a9a1d28c285204b385a13eef5a79a
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-18 (Sun, 18 Dec 2016)
Changed paths:
M htdocs/comm/mailing/card.php
M htdocs/core/class/CMailFile.class.php
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/mails.lang
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 4.0
Conflicts:
htdocs/core/class/CMailFile.class.php
htdocs/langs/en_US/errors.lang
Commit: c36d4b9894fc825e81c44c1a98da2ebd5c2d3f4a
https://github.com/Dolibarr/dolibarr/commit/c36d4b9894fc825e81c44c1a98da2ebd5c2d3f4a
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-18 (Sun, 18 Dec 2016)
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: 27785323ae4f84e2d59b3ca9f36f59ab8aae0520
https://github.com/Dolibarr/dolibarr/commit/27785323ae4f84e2d59b3ca9f36f59ab8aae0520
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-18 (Sun, 18 Dec 2016)
Changed paths:
M htdocs/core/class/commondocgenerator.class.php
Log Message:
-----------
Merge pull request #6164 from hregis/4.0_bug
Fix: missing date locale and date rfc
Commit: 47bf442c849083aec1d0427369a29bccd54f67a6
https://github.com/Dolibarr/dolibarr/commit/47bf442c849083aec1d0427369a29bccd54f67a6
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-18 (Sun, 18 Dec 2016)
Changed paths:
M htdocs/core/ajax/bankconciliate.php
Log Message:
-----------
Merge pull request #6167 from atm-florian/4.0
GETPOST instead of $_GET
Commit: a37b1fb6c1c43abfd4735e4b90313d7d3bffb3fc
https://github.com/Dolibarr/dolibarr/commit/a37b1fb6c1c43abfd4735e4b90313d7d3bffb3fc
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-18 (Sun, 18 Dec 2016)
Changed paths:
M htdocs/supplier_proposal/class/supplier_proposal.class.php
Log Message:
-----------
Merge pull request #6171 from fmarcet/4.0
FIX: Setting supplier as client when accept a supplier proposal
Commit: 0e7da2cd22b25bd59dea4e0a01ad26d9c7cee18a
https://github.com/Dolibarr/dolibarr/commit/0e7da2cd22b25bd59dea4e0a01ad26d9c7cee18a
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-18 (Sun, 18 Dec 2016)
Changed paths:
M htdocs/core/modules/modProjet.class.php
Log Message:
-----------
FIX Label of project is in field title not label.
Commit: 9d3bd9d36fbed979f7157546f0970effb260f30c
https://github.com/Dolibarr/dolibarr/commit/9d3bd9d36fbed979f7157546f0970effb260f30c
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-18 (Sun, 18 Dec 2016)
Changed paths:
M htdocs/comm/mailing/card.php
M htdocs/core/ajax/bankconciliate.php
M htdocs/core/class/CMailFile.class.php
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/modules/modProjet.class.php
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/mails.lang
M htdocs/supplier_proposal/class/supplier_proposal.class.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/errors.lang
Commit: 2644eb064e2a2c2db43e9a7e0ad725ddd3e5a00e
https://github.com/Dolibarr/dolibarr/commit/2644eb064e2a2c2db43e9a7e0ad725ddd3e5a00e
Author: Laurent Destailleur <address@hidden>
Date: 2016-12-18 (Sun, 18 Dec 2016)
Changed paths:
M htdocs/adherents/card.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/06ee3b0d1c82...2644eb064e2a