[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 00779d: FIX #1460, #1461
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 00779d: FIX #1460, #1461 |
Date: |
Sat, 28 Jun 2014 05:55:17 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 00779dd8faead4a7f8017e09708a968f8cc2ffb5
https://github.com/Dolibarr/dolibarr/commit/00779dd8faead4a7f8017e09708a968f8cc2ffb5
Author: Cedric <address@hidden>
Date: 2014-06-24 (Tue, 24 Jun 2014)
Changed paths:
M ChangeLog
M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/fiche.php
Log Message:
-----------
FIX #1460, #1461
Commit: 0c382ef97ef116429ac613430ebecc909bc0c1df
https://github.com/Dolibarr/dolibarr/commit/0c382ef97ef116429ac613430ebecc909bc0c1df
Author: Cedric <address@hidden>
Date: 2014-06-24 (Tue, 24 Jun 2014)
Changed paths:
M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
Log Message:
-----------
Remove failure test on trigger
Commit: e21e4dbf1172586c0a96cb764ebe5d6490d46590
https://github.com/Dolibarr/dolibarr/commit/e21e4dbf1172586c0a96cb764ebe5d6490d46590
Author: Cedric <address@hidden>
Date: 2014-06-24 (Tue, 24 Jun 2014)
Changed paths:
M ChangeLog
M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/facture/fiche.php
Log Message:
-----------
- FIX #1482 #1484 #1486
- Add missing triggers in interface_90
Commit: ee91f4a3f71a25f28c184962e047ca7eaec37113
https://github.com/Dolibarr/dolibarr/commit/ee91f4a3f71a25f28c184962e047ca7eaec37113
Author: Cedric <address@hidden>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M ChangeLog
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
Log Message:
-----------
FIX : #1477, #1478, #1479
Commit: 2b93380ab0e8a042e7c4f6ba1a70988e7a9dd1df
https://github.com/Dolibarr/dolibarr/commit/2b93380ab0e8a042e7c4f6ba1a70988e7a9dd1df
Author: Laurent Destailleur <address@hidden>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M htdocs/langs/pt_BR/admin.lang
M htdocs/langs/pt_BR/agenda.lang
M htdocs/langs/pt_BR/banks.lang
M htdocs/langs/pt_BR/bills.lang
M htdocs/langs/pt_BR/bookmarks.lang
M htdocs/langs/pt_BR/boxes.lang
M htdocs/langs/pt_BR/cashdesk.lang
M htdocs/langs/pt_BR/categories.lang
M htdocs/langs/pt_BR/commercial.lang
M htdocs/langs/pt_BR/companies.lang
M htdocs/langs/pt_BR/compta.lang
M htdocs/langs/pt_BR/contracts.lang
M htdocs/langs/pt_BR/errors.lang
M htdocs/langs/pt_BR/exports.lang
M htdocs/langs/pt_BR/help.lang
M htdocs/langs/pt_BR/holiday.lang
M htdocs/langs/pt_BR/install.lang
M htdocs/langs/pt_BR/languages.lang
M htdocs/langs/pt_BR/mails.lang
M htdocs/langs/pt_BR/main.lang
M htdocs/langs/pt_BR/margins.lang
M htdocs/langs/pt_BR/members.lang
M htdocs/langs/pt_BR/opensurvey.lang
M htdocs/langs/pt_BR/orders.lang
M htdocs/langs/pt_BR/other.lang
M htdocs/langs/pt_BR/paypal.lang
M htdocs/langs/pt_BR/products.lang
M htdocs/langs/pt_BR/projects.lang
M htdocs/langs/pt_BR/shop.lang
M htdocs/langs/pt_BR/stocks.lang
M htdocs/langs/pt_BR/users.lang
M htdocs/langs/pt_BR/withdrawals.lang
Log Message:
-----------
Syn pt_BR from transifex
Commit: f5980a1d203589cdd15c7212cf4d4c07c15f007b
https://github.com/Dolibarr/dolibarr/commit/f5980a1d203589cdd15c7212cf4d4c07c15f007b
Author: Raphaƫl Doursenaud <address@hidden>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M htdocs/holiday/month_report.php
M htdocs/product/stock/lib/replenishment.lib.php
Log Message:
-----------
Fix database prefix usage
Commit: 72d1a9606e353b0e9935e44562da57d47b7d836e
https://github.com/Dolibarr/dolibarr/commit/72d1a9606e353b0e9935e44562da57d47b7d836e
Author: Laurent Destailleur <address@hidden>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M htdocs/holiday/month_report.php
M htdocs/product/stock/lib/replenishment.lib.php
Log Message:
-----------
Merge pull request #1688 from GPCsolutions/3.5-databaseprefix
Fix database prefix usage
Commit: fc4493242a7e9b34611b75786ed3a10b0b1695f9
https://github.com/Dolibarr/dolibarr/commit/fc4493242a7e9b34611b75786ed3a10b0b1695f9
Author: Laurent Destailleur <address@hidden>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M ChangeLog
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
Log Message:
-----------
Merge pull request #1685 from KreizIT/3.6
FIX : #1477, #1478, #1479
Commit: 092d1b725d9f2b45afd2e43cdf2713cd2e6a84e8
https://github.com/Dolibarr/dolibarr/commit/092d1b725d9f2b45afd2e43cdf2713cd2e6a84e8
Author: Laurent Destailleur <address@hidden>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M ChangeLog
M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/fiche.php
M htdocs/fourn/facture/fiche.php
Log Message:
-----------
Merge pull request #1684 from KreizIT/triggers
FIX #1460, #1461
Commit: 18838ccfa06d206748874e354741396b9b42e3a8
https://github.com/Dolibarr/dolibarr/commit/18838ccfa06d206748874e354741396b9b42e3a8
Author: Laurent Destailleur <address@hidden>
Date: 2014-06-28 (Sat, 28 Jun 2014)
Changed paths:
M htdocs/adherents/card_subscriptions.php
Log Message:
-----------
Fix: Correct name for thirdparty created from member.
Commit: d903db6a18d8b6b3286bc126897c1b15ebadb983
https://github.com/Dolibarr/dolibarr/commit/d903db6a18d8b6b3286bc126897c1b15ebadb983
Author: Laurent Destailleur <address@hidden>
Date: 2014-06-28 (Sat, 28 Jun 2014)
Changed paths:
M ChangeLog
M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/fiche.php
M htdocs/fourn/facture/fiche.php
M htdocs/holiday/month_report.php
M htdocs/product/stock/lib/replenishment.lib.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: ef8b55575085c584242ea68080aee1188c1770b5
https://github.com/Dolibarr/dolibarr/commit/ef8b55575085c584242ea68080aee1188c1770b5
Author: Laurent Destailleur <address@hidden>
Date: 2014-06-28 (Sat, 28 Jun 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/CMailFile.class.php
Log Message:
-----------
Fix: When using option MAIN_MAIL_ALLOW_SENDMAIL_F, a mail was sent to
sender.
Commit: 71ee974ddbab5c1156792448be40fdf5e849903c
https://github.com/Dolibarr/dolibarr/commit/71ee974ddbab5c1156792448be40fdf5e849903c
Author: Laurent Destailleur <address@hidden>
Date: 2014-06-28 (Sat, 28 Jun 2014)
Changed paths:
M ChangeLog
M htdocs/adherents/card_subscriptions.php
M htdocs/core/class/CMailFile.class.php
M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/fiche.php
M htdocs/fourn/facture/fiche.php
M htdocs/holiday/month_report.php
M htdocs/product/stock/lib/replenishment.lib.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
Commit: 2c493a4fe3b43eac5a598734661fef7b3b008346
https://github.com/Dolibarr/dolibarr/commit/2c493a4fe3b43eac5a598734661fef7b3b008346
Author: Laurent Destailleur <address@hidden>
Date: 2014-06-28 (Sat, 28 Jun 2014)
Changed paths:
M ChangeLog
M htdocs/adherents/card_subscriptions.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/core/class/CMailFile.class.php
M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/fiche.php
M htdocs/fourn/facture/fiche.php
M htdocs/holiday/month_report.php
M htdocs/product/stock/lib/replenishment.lib.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
ChangeLog
Compare:
https://github.com/Dolibarr/dolibarr/compare/7d72b6c3a1d5...2c493a4fe3b4