[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 747b2a: FIX: check for expedition bat
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 747b2a: FIX: check for expedition batch lines |
|
Date: |
Sun, 21 Dec 2014 18:14:52 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 747b2af06bdc42169d58a78c439bc0b8033d19f5
https://github.com/Dolibarr/dolibarr/commit/747b2af06bdc42169d58a78c439bc0b8033d19f5
Author: Francis Appels <address@hidden>
Date: 2014-12-19 (Fri, 19 Dec 2014)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
FIX: check for expedition batch lines
check if expedition batch lines are available before foreach
Commit: b0ae8cfb9e7fcad5464f1658ee7934ea58d6da4f
https://github.com/Dolibarr/dolibarr/commit/b0ae8cfb9e7fcad5464f1658ee7934ea58d6da4f
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-20 (Sat, 20 Dec 2014)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Merge pull request #2161 from fappels/3.7
FIX: check for expedition batch lines
Commit: 8996953077b48206bda83a2ccb2e7304be79daf0
https://github.com/Dolibarr/dolibarr/commit/8996953077b48206bda83a2ccb2e7304be79daf0
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-20 (Sat, 20 Dec 2014)
Changed paths:
M dev/skeletons/skeleton_webservice_server.php
M htdocs/adherents/class/adherent.class.php
M htdocs/compta/bank/class/bankcateg.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/tva/class/tva.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/db/sqlite.class.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/syslog/logHandlerInterface.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/holiday/tomergewithdefine_holiday.php
M htdocs/societe/class/societe.class.php
M htdocs/user/class/user.class.php
M htdocs/webservices/server_contact.php
M htdocs/webservices/server_productorservice.php
M htdocs/webservices/server_user.php
Log Message:
-----------
Fix: error reported by scrutinizer
Commit: 74d5e1183127950be05b8f1e4f5370fa18f8951d
https://github.com/Dolibarr/dolibarr/commit/74d5e1183127950be05b8f1e4f5370fa18f8951d
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-20 (Sat, 20 Dec 2014)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/ajax.lib.php
M htdocs/expedition/class/expedition.class.php
M htdocs/langs/en_US/main.lang
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
Commit: c05c2fe427d2b203bd30c96310058323e3303823
https://github.com/Dolibarr/dolibarr/commit/c05c2fe427d2b203bd30c96310058323e3303823
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-20 (Sat, 20 Dec 2014)
Changed paths:
M htdocs/admin/system/perf.php
M htdocs/admin/system/phpinfo.php
Log Message:
-----------
Info to help debug perf pb.
Commit: 268723be7bb02499c8c12ae9d50207a4a3275114
https://github.com/Dolibarr/dolibarr/commit/268723be7bb02499c8c12ae9d50207a4a3275114
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-21 (Sun, 21 Dec 2014)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Fixed: sql syntax error
Commit: 22c27e870364f57f5a859f3805dfc93298251f7f
https://github.com/Dolibarr/dolibarr/commit/22c27e870364f57f5a859f3805dfc93298251f7f
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-21 (Sun, 21 Dec 2014)
Changed paths:
M htdocs/core/class/dolprintipp.class.php
Log Message:
-----------
PHPCS
Commit: bdb47921e7bbfc5e6de690e7266b413050e4fb6e
https://github.com/Dolibarr/dolibarr/commit/bdb47921e7bbfc5e6de690e7266b413050e4fb6e
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-21 (Sun, 21 Dec 2014)
Changed paths:
M htdocs/compta/stats/index.php
Log Message:
-----------
Fixed: Bad value for % increase for first year.
Commit: 31f782ffe9119db94683f06bac91bf727f550487
https://github.com/Dolibarr/dolibarr/commit/31f782ffe9119db94683f06bac91bf727f550487
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-21 (Sun, 21 Dec 2014)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/project.lib.php
M htdocs/projet/activity/list.php
M htdocs/projet/tasks/contact.php
M htdocs/projet/tasks/document.php
M htdocs/projet/tasks/note.php
M htdocs/projet/tasks/task.php
M htdocs/projet/tasks/time.php
Log Message:
-----------
Fix: Several fixes into tasks and time spent management
Commit: 38b51c0a14d0d85bb831d3859eae1f148175215a
https://github.com/Dolibarr/dolibarr/commit/38b51c0a14d0d85bb831d3859eae1f148175215a
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-21 (Sun, 21 Dec 2014)
Changed paths:
A dev/initdata/mysqldump_dolibarr_3.7.0.sql
M dev/initdata/savedemo.sh
Log Message:
-----------
Prepare 3.7 release
Commit: 46fdd19389fdea8ce6c5840b4c36da18c720747b
https://github.com/Dolibarr/dolibarr/commit/46fdd19389fdea8ce6c5840b4c36da18c720747b
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-22 (Mon, 22 Dec 2014)
Changed paths:
M htdocs/theme/eldy/img/menus/agenda.png
A htdocs/theme/eldy/img/menus/agenda_over.png
M htdocs/theme/eldy/img/menus/bank.png
A htdocs/theme/eldy/img/menus/bank_over.png
M htdocs/theme/eldy/img/menus/commercial.png
A htdocs/theme/eldy/img/menus/commercial_over.png
M htdocs/theme/eldy/img/menus/company.png
A htdocs/theme/eldy/img/menus/company_over.png
R htdocs/theme/eldy/img/menus/cron.png
M htdocs/theme/eldy/img/menus/ecm.png
A htdocs/theme/eldy/img/menus/ecm_over.png
M htdocs/theme/eldy/img/menus/externalsite.png
A htdocs/theme/eldy/img/menus/externalsite_over.png
A htdocs/theme/eldy/img/menus/ftp.png
A htdocs/theme/eldy/img/menus/ftp_over.png
M htdocs/theme/eldy/img/menus/generic1.png
A htdocs/theme/eldy/img/menus/generic1_over.png
M htdocs/theme/eldy/img/menus/generic2.png
A htdocs/theme/eldy/img/menus/generic2_over.png
M htdocs/theme/eldy/img/menus/generic3.png
A htdocs/theme/eldy/img/menus/generic3_over.png
M htdocs/theme/eldy/img/menus/generic4.png
A htdocs/theme/eldy/img/menus/generic4_over.png
M htdocs/theme/eldy/img/menus/globe.png
A htdocs/theme/eldy/img/menus/globe_over.png
M htdocs/theme/eldy/img/menus/holiday.png
M htdocs/theme/eldy/img/menus/home.png
A htdocs/theme/eldy/img/menus/home_over.png
M htdocs/theme/eldy/img/menus/mail.png
A htdocs/theme/eldy/img/menus/mail_over.png
M htdocs/theme/eldy/img/menus/members.png
A htdocs/theme/eldy/img/menus/members_over.png
M htdocs/theme/eldy/img/menus/money.png
A htdocs/theme/eldy/img/menus/money_over.png
M htdocs/theme/eldy/img/menus/pointofsale.png
A htdocs/theme/eldy/img/menus/pointofsale_over.png
M htdocs/theme/eldy/img/menus/products.png
A htdocs/theme/eldy/img/menus/products_over.png
M htdocs/theme/eldy/img/menus/project.png
A htdocs/theme/eldy/img/menus/project_over.png
A htdocs/theme/eldy/img/menus/shop.png
A htdocs/theme/eldy/img/menus/shop_over.png
M htdocs/theme/eldy/img/menus/tools.png
A htdocs/theme/eldy/img/menus/tools_over.png
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Update image for menu
Commit: 1dc2bbb0f14451558f386a1079db07f1d9d528fc
https://github.com/Dolibarr/dolibarr/commit/1dc2bbb0f14451558f386a1079db07f1d9d528fc
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-22 (Mon, 22 Dec 2014)
Changed paths:
M htdocs/core/lib/ecm.lib.php
Log Message:
-----------
Fixed: Var no declared
Commit: e6d2bc0bff55007f7b642222a7088d39dd70dcf6
https://github.com/Dolibarr/dolibarr/commit/e6d2bc0bff55007f7b642222a7088d39dd70dcf6
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-22 (Mon, 22 Dec 2014)
Changed paths:
M htdocs/theme/eldy/img/object_action.png
Log Message:
-----------
Maj icon
Commit: 2a3bb96c34cabb52c5d740ac0dbdd3c3820ecbf4
https://github.com/Dolibarr/dolibarr/commit/2a3bb96c34cabb52c5d740ac0dbdd3c3820ecbf4
Author: Laurent Destailleur <address@hidden>
Date: 2014-12-22 (Mon, 22 Dec 2014)
Changed paths:
A dev/initdata/mysqldump_dolibarr_3.7.0.sql
M dev/initdata/savedemo.sh
M dev/skeletons/skeleton_webservice_server.php
M htdocs/adherents/class/adherent.class.php
M htdocs/admin/system/perf.php
M htdocs/admin/system/phpinfo.php
M htdocs/compta/bank/class/bankcateg.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/stats/index.php
M htdocs/compta/tva/class/tva.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/db/sqlite.class.php
M htdocs/core/lib/ecm.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/modules/syslog/logHandlerInterface.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/holiday/tomergewithdefine_holiday.php
M htdocs/projet/activity/list.php
M htdocs/projet/tasks/contact.php
M htdocs/projet/tasks/document.php
M htdocs/projet/tasks/note.php
M htdocs/projet/tasks/task.php
M htdocs/projet/tasks/time.php
M htdocs/societe/class/societe.class.php
M htdocs/theme/eldy/img/object_action.png
M htdocs/user/class/user.class.php
M htdocs/webservices/server_contact.php
M htdocs/webservices/server_productorservice.php
M htdocs/webservices/server_user.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/ecm.lib.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/90d275bd2068...2a3bb96c34ca