lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
75,362 Commits 43 Branches 150 Tags 886 MiB
e9b13baac2
Commit Graph

65989 Commits

Author SHA1 Message Date
Laurent Destailleur
ac25003d33 Dolibarize module ticket 2019-04-10 11:39:54 +02:00
Christophe Battarel
79beb59385 use outputlangs in fullname construction for emails 2019-04-10 11:11:41 +02:00
Christophe Battarel
46e398f3d3 NEW : retrieve invoice infos from order when billing shipment 2019-04-10 10:50:01 +02:00
Christophe Battarel
b04296984d NEW constant KEEP_DISCOUNT_LINES_FROM_ORIGIN 2019-04-10 10:29:17 +02:00
Laurent Destailleur
2765cee005 CSS 2019-04-09 19:36:56 +02:00
Laurent Destailleur
861c1b412c CSS 2019-04-09 19:23:34 +02:00
Christophe Battarel
5f9f615e11 fix form_conditions_reglement parameters 2019-04-09 18:37:36 +02:00
Christophe Battarel
790c5f493a fix select_conditions parameters 2019-04-09 18:32:00 +02:00
Christophe Battarel
01255602d8 fix select_conditions parameters 2019-04-09 18:30:58 +02:00
Christophe Battarel
5382ad207f NEW : add payment terms to invoices list 2019-04-09 18:26:00 +02:00
Laurent Destailleur
ff629b2355 NEW Color for hover and for checked line is on by default 2019-04-09 15:57:26 +02:00
Laurent Destailleur
7790140f22 CSS 2019-04-09 14:13:34 +02:00
Laurent Destailleur
f9860e1425 Work on email collector 2019-04-09 13:23:30 +02:00
Lionel VESSILLER
86d4f5d213 New company fields in contact export 2019-04-09 10:13:26 +02:00
Philippe GRAND
bb5e60ad54 update code 2019-04-09 09:39:38 +02:00
Philippe GRAND
9b8297ee15 update code 2019-04-09 09:39:00 +02:00
Philippe GRAND
2e7256a094 update code 2019-04-09 09:38:35 +02:00
Philippe GRAND
1b2aa27c2f update code 2019-04-09 09:37:21 +02:00
Philippe GRAND
3ff5c6b42b update code 2019-04-09 09:36:51 +02:00
Philippe GRAND
144ebb2f89 update code 2019-04-09 09:35:39 +02:00
Philippe GRAND
1d84dcbe17 update code 2019-04-09 09:34:26 +02:00
Philippe GRAND
c26afe15ff update code 2019-04-09 09:33:20 +02:00
Philippe GRAND
350a04108f update code 2019-04-09 09:32:18 +02:00
Philippe GRAND
edd5661f1a update code 2019-04-09 09:31:33 +02:00
Philippe GRAND
3a209d2454 update code 2019-04-09 09:30:32 +02:00
Philippe GRAND
42df91e4e2 update code 2019-04-09 09:29:01 +02:00
Philippe GRAND
30e2d8fa6b update code 2019-04-09 09:28:01 +02:00
Philippe GRAND
327ac2973e update code 2019-04-09 09:27:25 +02:00
Philippe GRAND
2ed71b0039 update code 2019-04-09 09:26:39 +02:00
Philippe GRAND
baecb20562 update code 2019-04-09 09:24:41 +02:00
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
andreubisquerra
d73b69df61 Add form class and fix autoprint with Takepos connector 2019-04-08 19:54:46 +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
Dan Rusu
4597e78a9d Re synchronized the UI action button "Mark as credit available" with API 
At some point we will need to move this code into common location (maybe facture.class.php) and call as function from both places
 2019-04-06 20:10:11 +03:00
Frédéric FRANCE
f7addaf1d4
Update card.php 2019-04-06 13:53:38 +02:00
Laurent Destailleur
56194091a9 trans 2019-04-06 13:27:38 +02:00
Laurent Destailleur
302a42a603 PHP 5.4 is no more supported. Minimum PHP is now 5.5+. 2019-04-06 13:20:26 +02:00
Laurent Destailleur
c61cbd7b15 Fix phpcs 2019-04-05 20:13:41 +02:00
Laurent Destailleur
54714bc755 Deprecated property ->fk_departement is now ->state_id everywhere. 2019-04-05 20:06:13 +02:00
Laurent Destailleur
67760d6f41 Fix phpcs 2019-04-05 19:53:45 +02:00
Laurent Destailleur
997d6cca0a Fix $db not defined 2019-04-05 19:49:47 +02:00
Laurent Destailleur
b6c19e0f35 Fix var not defined 2019-04-05 19:48:32 +02:00
Laurent Destailleur
ba9cceeee5 Fix phpcs 2019-04-05 19:42:56 +02:00
Laurent Destailleur
becefeebff Fix upload of files without extension 2019-04-05 19:39:49 +02:00
Laurent Destailleur
0fd1f9abf6 Show if there is no uploaded files 2019-04-05 19:39:30 +02:00
Laurent Destailleur
734b97e255 Fix upload of files without extension 2019-04-05 19:39:04 +02:00
DALL'AGNOLA Cédric
c2127a6702
is_empty to empty 2019-04-05 15:49:00 +02:00
Frédéric FRANCE
4d43cd4927
Update card.php 2019-04-05 14:46:31 +02:00
Laurent Destailleur
1ffb5a72d5 Replace image with font awesome 2019-04-05 14:45:54 +02:00
Laurent Destailleur
163665e4b5 FIX A page of a site replaced with another when switching in edit mode 
Conflicts:
	htdocs/website/index.php
 2019-04-05 11:36:48 +02:00
Laurent Destailleur
44f113c718 FIX A page of a site replaced with another when switching in edit mode 2019-04-05 11:34:06 +02:00
atm-ph
ea87b2ddb6 Fix no init hook on timesheet 2019-04-05 11:26:11 +02:00
Laurent Destailleur
9e98421333 CSS 2019-04-05 11:09:58 +02:00
Laurent Destailleur
00cdf13a15 Revert "Do not close php tags" 
This reverts commit 1db134c2a0.
 2019-04-05 11:09:39 +02:00
atm-ph
285e60e9f1 Fix default filter 2019-04-05 10:57:50 +02:00
Philippe GRAND
0513ae8cd0 to avoid : Warning: A non-numeric value encountered 2019-04-05 09:41:27 +02:00
DALL'AGNOLA Cédric
cf3364d205
fix: count throws an error when parameter is null 
At the first connection, $_SESSION['poscart'] is empty or null and when you try to add an item to the cart in cashdesk you got this:

Warning: count(): Parameter must be an array or an object that implements Countable in /homepages/35/d523563538/htdocs/clickandbuilds/dolibarr/afds/cashdesk/class/Facturation.class.php on line 145

Warning: Cannot modify header information - headers already sent by (output started at /homepages/35/d523563538/htdocs/clickandbuilds/dolibarr/afds/cashdesk/class/Facturation.class.php:145) in /homepages/35/d523563538/htdocs/clickandbuilds/dolibarr/afds/cashdesk/facturation_verif.php on line 234
 2019-04-05 08:28:59 +02:00
Laurent Destailleur
fff9b7db9d Fix doxygen 2019-04-04 18:33:12 +02:00
Laurent Destailleur
5891d0a056 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/list.php
	htdocs/projet/list.php
 2019-04-04 17:45:02 +02:00
Laurent Destailleur
9c7464d157 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/list.php
	htdocs/societe/card.php
 2019-04-04 17:42:12 +02:00
Laurent Destailleur
fa95f5575c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/product/list.php
 2019-04-04 17:41:22 +02:00
Laurent Destailleur
eaf9a2402a Fix length of label 2019-04-04 17:39:51 +02:00
Laurent Destailleur
e79204e81a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/product/list.php
 2019-04-04 17:13:52 +02:00
Alexandre SPANGARO
4335ea9064 NEW: Accounting - Invert module name 2019-04-04 17:13:20 +02:00
Laurent Destailleur
4489db2a70 Fix field surface/weight not loaded 2019-04-04 17:06:26 +02:00
Alexandre SPANGARO
b64ee3af70 FIX: Problem with badge in tab in expedition card 2019-04-04 17:02:18 +02:00
Alexandre SPANGARO
ba34b601b3 FIX: MultiEntity in lettering functionality 2019-04-04 16:44:36 +02:00
Laurent Destailleur
1ac51b6e06 More complete example to fix migration error from v8 2019-04-04 13:46:01 +02:00
atm-arnaud
0b6c7d2d63 FIX shipping default warehouse if only one warehouse 2019-04-04 11:17:44 +02:00
Laurent Destailleur
21b9836508 FIX default value of language of thirdparty 
Conflicts:
	htdocs/societe/card.php
 2019-04-04 11:08:13 +02:00
Laurent Destailleur
3fb97de996 Fix default value of language of thirdparty 2019-04-04 11:05:15 +02:00
John BOTELLA
3299b765f1 New pdf models 2019-04-04 10:16:20 +02:00
Laurent Destailleur
56f8c42b0a The PHP extension php-intl is not mandatory but should be installed to 
have new features working correctly.
 2019-04-03 19:37:54 +02:00
Laurent Destailleur
1f00e24abc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-03 18:52:47 +02:00
Laurent Destailleur
9e5d87e821 Fix warning 2019-04-03 18:39:27 +02:00
Laurent Destailleur
82c19a6372 FIX Avoid error 500 when extension php-intl not loaded 2019-04-03 18:38:27 +02:00
Laurent Destailleur
76dcbf7424 Fix phpcs for wrapper 2019-04-03 18:16:33 +02:00
Laurent Destailleur
1db134c2a0 Do not close php tags 2019-04-03 18:13:39 +02:00
Laurent Destailleur
83cf0dabae NEW Add more complete error messages in log on stripe payments 2019-04-03 17:54:55 +02:00
Laurent Destailleur
b97a9d1ef3 NEW Add more complete error messages in log on stripe payments 2019-04-03 17:53:24 +02:00
Laurent Destailleur
a858025d63 Option MAIN_TOP_MENU_DROPDOWN removed. New dropdown is always on now. 2019-04-03 16:34:02 +02:00
Laurent Destailleur
333ba7b549 Save files for website template 2019-04-03 16:28:16 +02:00
John BOTELLA
a668cc28b1 Add table title auto height 2019-04-03 16:19:49 +02:00
Laurent Destailleur
eb6bd20132 Fix error message 2019-04-03 16:16:51 +02:00
Laurent Destailleur
76bf412f95 Fix phpcs 2019-04-03 14:40:15 +02:00
Laurent Destailleur
853a0ab7a3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-03 14:38:42 +02:00
Laurent Destailleur
c5f5abc67d Fix css for MD theme 2019-04-03 14:37:38 +02:00
Laurent Destailleur
d7510016da Include files are named .inc.php 2019-04-03 13:29:49 +02:00
Laurent Destailleur
bfed3685a5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-03 13:27:13 +02:00
Laurent Destailleur
7120078b0f NEW Simplification of styles architcture: Showing or not the menuhider 
is completely decided by CSS and screen size instead of PHP+CSS.
 2019-04-03 13:26:50 +02:00
Laurent Destailleur
993920628b Fix phpcs 2019-04-03 12:33:24 +02:00
Laurent Destailleur
64889f4639
Merge pull request #10947 from grandoc/new_branch_01_04_2019 
update comments
 2019-04-03 11:05:05 +02:00
Laurent Destailleur
80be77d95d
Merge pull request #10948 from ptibogxiv/patch-148 
fix term autoOrManual
 2019-04-03 11:03:44 +02:00
Laurent Destailleur
379f9f2d53 Fix phpcs 2019-04-02 20:36:00 +02:00
Laurent Destailleur
bb9cd05ea8 Fix phpcs 2019-04-02 20:02:43 +02:00
Laurent Destailleur
ebd3a04f7f Fix translation 2019-04-02 19:48:58 +02:00
Laurent Destailleur
42fda54edf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/fichinter/list.php
	htdocs/product/stock/replenish.php
 2019-04-02 19:41:58 +02:00
Laurent Destailleur
c5348be337 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-02 19:35:42 +02:00
Laurent Destailleur
17a61b3232 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-04-02 19:34:49 +02:00
Laurent Destailleur
26fbd6e2ec Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-04-02 19:34:16 +02:00
Laurent Destailleur
cb1489e2fa Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-04-02 19:34:10 +02:00
Laurent Destailleur
9b77cc4db8 Translation of currency 2019-04-02 19:33:14 +02:00