[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 87b9d0: Fix element page on project
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 87b9d0: Fix element page on project |
|
Date: |
Sat, 24 May 2014 16:19:39 -0700 |
Branch: refs/heads/3.5_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: 87b9d0412cd162ec0601876f978fba59082a36ab
https://github.com/Dolibarr/dolibarr/commit/87b9d0412cd162ec0601876f978fba59082a36ab
Author: Florian HENRY <address@hidden>
Date: 2014-05-22 (Thu, 22 May 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/html.formprojet.class.php
M htdocs/projet/element.php
Log Message:
-----------
Fix element page on project
Commit: 2a16a562d9202fa963a68409416bb83da57fa005
https://github.com/Dolibarr/dolibarr/commit/2a16a562d9202fa963a68409416bb83da57fa005
Author: Florian HENRY <address@hidden>
Date: 2014-05-22 (Thu, 22 May 2014)
Changed paths:
M ChangeLog
M htdocs/admin/dict.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/modules/commande/mod_commande_marbre.php
M htdocs/core/modules/contract/mod_contract_serpis.php
M htdocs/core/modules/expedition/mod_expedition_safor.php
M htdocs/core/modules/facture/mod_facture_mars.php
M htdocs/core/modules/facture/mod_facture_terre.php
M htdocs/core/modules/fichinter/mod_pacific.php
M htdocs/core/modules/livraison/mod_livraison_jade.php
M htdocs/core/modules/project/mod_project_simple.php
M htdocs/core/modules/project/task/mod_task_simple.php
M htdocs/core/modules/propale/mod_propale_marbre.php
M htdocs/core/modules/societe/mod_codeclient_monkey.php
M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
M htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Conflicts:
ChangeLog
Commit: 13da9c368e02a2f22736f37e8559f2de68417c50
https://github.com/Dolibarr/dolibarr/commit/13da9c368e02a2f22736f37e8559f2de68417c50
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-22 (Thu, 22 May 2014)
Changed paths:
M ChangeLog
M htdocs/core/class/html.formprojet.class.php
M htdocs/projet/element.php
Log Message:
-----------
Merge pull request #1615 from FHenry/3.5
3.5
Commit: 3481884731ea1956b83c747d3a78a238287a6f9b
https://github.com/Dolibarr/dolibarr/commit/3481884731ea1956b83c747d3a78a238287a6f9b
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-22 (Thu, 22 May 2014)
Changed paths:
M htdocs/projet/element.php
Log Message:
-----------
Fix: A project is linked to a thirdparty (may be a customer, a supplier
or a prospect).
Commit: 603c28dcdd619b39c85ea0ae95b97fe581c98afa
https://github.com/Dolibarr/dolibarr/commit/603c28dcdd619b39c85ea0ae95b97fe581c98afa
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M ChangeLog
M htdocs/fourn/commande/liste.php
Log Message:
-----------
[ bug #1397 ] Filter by supplier orders with status Draft does not filter
Commit: b2f299f5e450934d838e287f5e63f887631ce7c8
https://github.com/Dolibarr/dolibarr/commit/b2f299f5e450934d838e287f5e63f887631ce7c8
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M ChangeLog
M htdocs/expedition/note.php
Log Message:
-----------
Fix: [ bug #1411 ] Unable to set an expedition note if invoices module is not
enabled
Commit: 77c09d887acf2ffd3bb1cbd182fa69ed8442d573
https://github.com/Dolibarr/dolibarr/commit/77c09d887acf2ffd3bb1cbd182fa69ed8442d573
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M ChangeLog
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
Log Message:
-----------
Fix: [ bug #1407 ] Rouget pdf overlapped when using tracking number and
public notes
Commit: 9cc74c36d272391e90bf566779ca3ba22812a822
https://github.com/Dolibarr/dolibarr/commit/9cc74c36d272391e90bf566779ca3ba22812a822
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
Log Message:
-----------
Missing copyright info
Commit: 0d121de1a631a140817b5ef04cf597d35083d4d6
https://github.com/Dolibarr/dolibarr/commit/0d121de1a631a140817b5ef04cf597d35083d4d6
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M ChangeLog
M htdocs/commande/orderstoinvoice.php
Log Message:
-----------
Fix: [ bug #1388 ] Wrong date when invoicing several orders
Commit: a705d4e3336c5b3b38bd51d30c3f67daaed7f288
https://github.com/Dolibarr/dolibarr/commit/a705d4e3336c5b3b38bd51d30c3f67daaed7f288
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M ChangeLog
M htdocs/commande/fiche.php
Log Message:
-----------
Fix: [ bug #1410 ] Add customer order line asks for required Unit Price but
doesn't interrupt the creation of the line
Commit: 43bf9ba89026eabd8f113697b897b6aafc0cfd33
https://github.com/Dolibarr/dolibarr/commit/43bf9ba89026eabd8f113697b897b6aafc0cfd33
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M htdocs/admin/agenda_extsites.php
M htdocs/comm/action/class/ical.class.php
M htdocs/comm/action/index.php
M htdocs/core/lib/agenda.lib.php
Log Message:
-----------
Fix: Import of ical files was broken
Fix: Can import of ical files from BlueMind.
Commit: 2c05146778fbb68b8a76a7b790197c05c57dd27d
https://github.com/Dolibarr/dolibarr/commit/2c05146778fbb68b8a76a7b790197c05c57dd27d
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M ChangeLog
M htdocs/commande/orderstoinvoice.php
Log Message:
-----------
Merge pull request #1621 from marcosgdf/bug-1388
Fix: [ bug #1388 ] Wrong date when invoicing several orders
Commit: 7acecadc797e5c22caccb263da384afa1fd9ad82
https://github.com/Dolibarr/dolibarr/commit/7acecadc797e5c22caccb263da384afa1fd9ad82
Author: Philippe Grand <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
avoid warning in commande.class.php if extrafields is used
avoid warning in commande.class.php if extrafields is used
Commit: fa733c8ba4f7d58e2461101e6a4178bc1acef18c
https://github.com/Dolibarr/dolibarr/commit/fa733c8ba4f7d58e2461101e6a4178bc1acef18c
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M ChangeLog
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
Log Message:
-----------
Fix: [ bug #1405 ] Rouget PDF expedition incorrect when two expeditions under
the same commande
Commit: 95d8161dc14a696c7123caa5f89ad1ccc58398c2
https://github.com/Dolibarr/dolibarr/commit/95d8161dc14a696c7123caa5f89ad1ccc58398c2
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Merge pull request #1623 from grandoc/3.5
avoid warning in commande.class.php if extrafields is used
Commit: 300e430024a83069f0bbd45030f0de89688b95de
https://github.com/Dolibarr/dolibarr/commit/300e430024a83069f0bbd45030f0de89688b95de
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M htdocs/core/db/mysql.class.php
M htdocs/core/db/mysqli.class.php
Log Message:
-----------
Fix: If user already exists but permissions not set, it was not possible
to install Dolibarr.
Commit: 20ec1e6ac8c8b51bc133288e704efba7c8eaedff
https://github.com/Dolibarr/dolibarr/commit/20ec1e6ac8c8b51bc133288e704efba7c8eaedff
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/fourn/facture/impayees.php
Log Message:
-----------
Fix: Suppliers invoices must be visible if module supplier is on.
Commit: 9c398b14c56a34f4286147ca2f467123f74fa267
https://github.com/Dolibarr/dolibarr/commit/9c398b14c56a34f4286147ca2f467123f74fa267
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M ChangeLog
M htdocs/fourn/commande/liste.php
Log Message:
-----------
Merge branch 'bug-1397' of github.com:marcosgdf/dolibarr into
marcosgdf-bug-1397
Conflicts:
ChangeLog
Commit: 1d01377dab09af6bbf1f54c88ab4565432ce17a4
https://github.com/Dolibarr/dolibarr/commit/1d01377dab09af6bbf1f54c88ab4565432ce17a4
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M ChangeLog
M htdocs/fourn/commande/liste.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1397' into 3.5
Commit: dc94b6e1bf7add2f8bc8df933f688e0815c58c0a
https://github.com/Dolibarr/dolibarr/commit/dc94b6e1bf7add2f8bc8df933f688e0815c58c0a
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M ChangeLog
M htdocs/commande/class/commande.class.php
M htdocs/commande/orderstoinvoice.php
M htdocs/core/db/mysql.class.php
M htdocs/core/db/mysqli.class.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: d1ee20dd42a2667ea82bb0fff7f838999933a916
https://github.com/Dolibarr/dolibarr/commit/d1ee20dd42a2667ea82bb0fff7f838999933a916
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M ChangeLog
M htdocs/expedition/note.php
Log Message:
-----------
Merge branch 'bug-1411' of github.com:marcosgdf/dolibarr into
marcosgdf-bug-1411
Conflicts:
ChangeLog
Commit: 31ea7117f0491e1fc980f0220bd437121af23aeb
https://github.com/Dolibarr/dolibarr/commit/31ea7117f0491e1fc980f0220bd437121af23aeb
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M ChangeLog
M htdocs/expedition/note.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1411' into 3.5
Commit: 2771c506e9fb9c2c444fe332cc4049a8c02e929a
https://github.com/Dolibarr/dolibarr/commit/2771c506e9fb9c2c444fe332cc4049a8c02e929a
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M ChangeLog
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
Log Message:
-----------
Merge branch 'bug-1407' of github.com:marcosgdf/dolibarr into
marcosgdf-bug-1407
Conflicts:
ChangeLog
Commit: df35b4d2eae56e76f95e2e0bcf9ed0622cf0dc6f
https://github.com/Dolibarr/dolibarr/commit/df35b4d2eae56e76f95e2e0bcf9ed0622cf0dc6f
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M ChangeLog
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1407' into 3.5
Commit: 649fdd72dcfbaf83983236c199d9d69333d6366f
https://github.com/Dolibarr/dolibarr/commit/649fdd72dcfbaf83983236c199d9d69333d6366f
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M ChangeLog
M htdocs/commande/fiche.php
Log Message:
-----------
Merge pull request #1622 from marcosgdf/bug-1410
Fix: [ bug #1410 ] Add customer order line asks for required Unit Price but
doesn't interrupt the creation of the line
Commit: 07bc93311029694f4cf5256b2c95b3a1a93483bd
https://github.com/Dolibarr/dolibarr/commit/07bc93311029694f4cf5256b2c95b3a1a93483bd
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M ChangeLog
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
Log Message:
-----------
Merge branch 'bug-1405' of github.com:marcosgdf/dolibarr into
marcosgdf-bug-1405
Conflicts:
ChangeLog
Commit: 8840e28bc08c196a6b7f89be065bb3f03a97b01b
https://github.com/Dolibarr/dolibarr/commit/8840e28bc08c196a6b7f89be065bb3f03a97b01b
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M ChangeLog
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1405' into 3.5
Commit: a63d085181b0582d9d94eebede97f9c4b87c7794
https://github.com/Dolibarr/dolibarr/commit/a63d085181b0582d9d94eebede97f9c4b87c7794
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M ChangeLog
M htdocs/commande/fiche.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: 23e951ff2a37bc5b8f004777d744ad4ae7abbde2
https://github.com/Dolibarr/dolibarr/commit/23e951ff2a37bc5b8f004777d744ad4ae7abbde2
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M htdocs/comm/propal.php
Log Message:
-----------
Fix: select_date accepts -1 or '' but not 0
Commit: f34aadef3df57794de74006bc2c2c9fc4da6be12
https://github.com/Dolibarr/dolibarr/commit/f34aadef3df57794de74006bc2c2c9fc4da6be12
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M htdocs/comm/propal.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix: css
Commit: 1df758320de0fc201f358d3ab955be820f10ddd3
https://github.com/Dolibarr/dolibarr/commit/1df758320de0fc201f358d3ab955be820f10ddd3
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-24 (Sat, 24 May 2014)
Changed paths:
M htdocs/comm/propal.php
Log Message:
-----------
Fix: the delivery date must not be set with date of proposal.
Commit: b11ef37c5882f3c9713f47a6f7dd3efe1c9a85b0
https://github.com/Dolibarr/dolibarr/commit/b11ef37c5882f3c9713f47a6f7dd3efe1c9a85b0
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-24 (Sat, 24 May 2014)
Changed paths:
M htdocs/comm/propal.php
Log Message:
-----------
Fix: Bad balance of table
Commit: 2a6b2a454075b31f43e356a8af4f3795070d12ae
https://github.com/Dolibarr/dolibarr/commit/2a6b2a454075b31f43e356a8af4f3795070d12ae
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-24 (Sat, 24 May 2014)
Changed paths:
M htdocs/admin/system/perf.php
Log Message:
-----------
Fix: Stat page show no cache when there is, if user was using apc.
Commit: 872e764c94ab5970eee8c89efdf4cf46d30792a0
https://github.com/Dolibarr/dolibarr/commit/872e764c94ab5970eee8c89efdf4cf46d30792a0
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-24 (Sat, 24 May 2014)
Changed paths:
M htdocs/core/lib/functions.lib.php
M test/phpunit/FunctionsLibTest.php
Log Message:
-----------
Fix: html detection was not working with hx tags.
Commit: a51e18a5a7577d517c49a71fac8ccdf3f6fc18f4
https://github.com/Dolibarr/dolibarr/commit/a51e18a5a7577d517c49a71fac8ccdf3f6fc18f4
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-24 (Sat, 24 May 2014)
Changed paths:
M htdocs/commande/fiche.php
M htdocs/holiday/admin/holiday.php
M htdocs/holiday/define_holiday.php
Log Message:
-----------
Fix: $error var must use type int and be increased when error found.
Using $error as boolean at some place was source of error.
Commit: 9bc1a6b4f56e34724cb62f9b7c1fd6bcbb072d19
https://github.com/Dolibarr/dolibarr/commit/9bc1a6b4f56e34724cb62f9b7c1fd6bcbb072d19
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-24 (Sat, 24 May 2014)
Changed paths:
M htdocs/core/lib/security2.lib.php
M htdocs/main.inc.php
Log Message:
-----------
Fix: favicon must use dol_buildpath and not hardcoded path
Conflicts:
htdocs/core/lib/security2.lib.php
Commit: 493e82b5329c3e383fac426c09f893bb3d8594dd
https://github.com/Dolibarr/dolibarr/commit/493e82b5329c3e383fac426c09f893bb3d8594dd
Author: Laurent Destailleur <address@hidden>
Date: 2014-05-25 (Sun, 25 May 2014)
Changed paths:
M ChangeLog
M htdocs/admin/agenda_extsites.php
M htdocs/admin/system/perf.php
M htdocs/comm/action/class/ical.class.php
M htdocs/comm/action/index.php
M htdocs/comm/propal.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/fiche.php
M htdocs/commande/orderstoinvoice.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/db/mysql.class.php
M htdocs/core/db/mysqli.class.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/security2.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/fourn/commande/liste.php
M htdocs/fourn/facture/impayees.php
M htdocs/holiday/admin/holiday.php
M htdocs/holiday/define_holiday.php
M htdocs/main.inc.php
M htdocs/projet/element.php
M htdocs/theme/eldy/style.css.php
M test/phpunit/FunctionsLibTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.5_backported
Conflicts:
htdocs/expedition/note.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/8ad453168b25...493e82b5329c