Commit Graph

65855 Commits

Author SHA1 Message Date
Philippe GRAND
0de76fc128 update code 2019-04-09 09:23:50 +02:00
Philippe GRAND
f833bbcb32 update code 2019-04-09 09:21:34 +02:00
Philippe GRAND
68c1332244 update code 2019-04-09 09:19:16 +02:00
Philippe GRAND
2722760d1d backward 2019-04-09 09:12:54 +02:00
Philippe GRAND
b42d2aa41e Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2019-04-09 09:10:34 +02:00
Laurent Destailleur
3cfeba0113 Standardize code 2019-04-09 01:23:27 +02:00
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +02:00
Laurent Destailleur
a19cedfc13 Fix phpcs 2019-04-09 00:48:12 +02:00
Laurent Destailleur
c0b3ee23e5 Fix phpcs 2019-04-08 23:50:18 +02:00
Laurent Destailleur
65e931cfe2 Work on email collector 2019-04-08 21:22:10 +02:00
Laurent Destailleur
36aa53e88d Missing trans 2019-04-08 19:40:52 +02:00
Laurent Destailleur
d01b54ca5b Fix phpcs 2019-04-08 18:02:27 +02:00
Laurent Destailleur
7b01e76d2b Fix doxygen 2019-04-08 16:04:15 +02:00
Laurent Destailleur
1274d71a10 Fix phpcs 2019-04-08 16:00:01 +02:00
Laurent Destailleur
917b9d69fa Removed the method 4 of GETPOST (to get $_COOKIE). It was not used and
not recommanded to use in Dolibarr.
2019-04-08 14:55:31 +02:00
Laurent Destailleur
1b415a6aed Fix translation of help tooltip on fields for modulebuilder. 2019-04-08 14:42:46 +02:00
Laurent Destailleur
2174e70414 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-08 14:09:29 +02:00
Laurent Destailleur
321ffb859b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/perweek.php
2019-04-08 14:09:18 +02:00
Laurent Destailleur
dccad0b19d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-08 14:05:23 +02:00
Laurent Destailleur
f4efc86dd3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-08 14:05:14 +02:00
Laurent Destailleur
ffca289bff Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-04-08 14:04:42 +02:00
Laurent Destailleur
2b87c8b663
Merge pull request #10810 from mwelters/patch-1
NEW improve Expensereport, Inverse Receiver
2019-04-08 14:04:08 +02:00
Laurent Destailleur
2047ad62c5
Merge pull request #10979 from fpeyraud/develop
Fix redirection on social tax deletion
2019-04-08 13:58:07 +02:00
Laurent Destailleur
2b5e25188c
Merge pull request #10977 from IonAgorria/resources-product
NEW: Resources tab possible in products/services
2019-04-08 13:57:30 +02:00
Laurent Destailleur
62f6764e4f
Merge pull request #10976 from IonAgorria/fix-supplier-prices
Fix dynamic prices bug caused by arg displacement
2019-04-08 13:53:11 +02:00
Laurent Destailleur
dc47d0c2ce
Merge pull request #10972 from Rusu-Marian-Dan/develop
Re synchronized the UI action button "Mark as credit available" with API
2019-04-08 13:52:20 +02:00
Laurent Destailleur
2b74c114a8
Merge pull request #10968 from frederic34/patch-4
add constant
2019-04-08 13:49:57 +02:00
Laurent Destailleur
125796b0f5
Merge pull request #10967 from atm-ph/fix_7.0_timesheet_init_hook
Fix no init hook on timesheet
2019-04-08 13:49:21 +02:00
Laurent Destailleur
c1f0826005
Update perweek.php 2019-04-08 13:49:16 +02:00
Laurent Destailleur
153e563c9f
Update perday.php 2019-04-08 13:49:05 +02:00
Laurent Destailleur
faf8803329
Merge pull request #10966 from atm-ph/fix_default_filter
Fix default filter
2019-04-08 13:48:31 +02:00
Laurent Destailleur
a7ced8ab5d
Merge pull request #10963 from aspangaro/v10_p3
NEW: Accounting - Invert module name
2019-04-08 13:39:51 +02:00
Laurent Destailleur
8accc894b0
Update admin.lang 2019-04-08 13:36:11 +02:00
Laurent Destailleur
2606de2119
Update modAccounting.class.php 2019-04-08 13:35:06 +02:00
Laurent Destailleur
7c91c1b9f1
Merge pull request #10962 from aspangaro/v10_p2
FIX: Problem with badge in tab in expedition card
2019-04-08 13:33:59 +02:00
Laurent Destailleur
47acbf4f54
Merge pull request #10961 from aspangaro/9.0_lettering
FIX: MultiEntity in lettering functionality
2019-04-08 13:33:01 +02:00
Laurent Destailleur
cd1322de79
Merge pull request #10959 from atm-arnaud/8.0_fix_shipping_default_warehouse_if_one
FIX shipping default warehouse if only one warehouse
2019-04-08 13:32:34 +02:00
Laurent Destailleur
976ef92df6
Merge pull request #10958 from atm-john/new_look_and_feel_pdf
New pdf document column system : supplier order and expedition
2019-04-08 13:31:47 +02:00
Laurent Destailleur
9a09949115
Merge pull request #10970 from cdallagnola/patch-1
Patch 1
2019-04-08 13:30:03 +02:00
Laurent Destailleur
da6c5b552f
Merge pull request #10950 from OPEN-DSI/new-extrafield-sellist-chkbxlst-options
New categories options in sellist and chbxlist extrafields
2019-04-08 13:28:51 +02:00
Laurent Destailleur
7b85a7977b
Update html.form.class.php 2019-04-08 13:28:32 +02:00
Laurent Destailleur
6f34a84a9a
Update categorie.class.php 2019-04-08 13:23:19 +02:00
Laurent Destailleur
b23f74eab1 FIX Status of opportunity should never be -1 2019-04-08 12:17:57 +02:00
Florent Peyraud
7672fd7cf0 Fix redirection on social tax deletion 2019-04-08 09:05:51 +02:00
Ion
b64cb4129f Add resources tab for products/services 2019-04-07 23:52:49 +02:00
Ion
06d3b5792c Fix dynamic prices bug caused by arg displacement 2019-04-07 21:41:31 +02:00
Laurent Destailleur
e800c45ab8 Can edit date of last collect by email collector 2019-04-07 18:36:25 +02:00
Laurent Destailleur
22ca858b36 Enhance setup of email collector 2019-04-07 18:32:01 +02:00
Laurent Destailleur
fad2fa48dd NEW Introduce a config parameter $dolibarr_main_instance_unique_id 2019-04-07 15:44:17 +02:00
Ion
71f30266dc Add service to getElementProperties 2019-04-07 12:53:52 +02:00