lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
83,748 Commits 43 Branches 150 Tags 886 MiB
7909055ee8
Commit Graph

7695 Commits

Author SHA1 Message Date
Laurent Destailleur
53e1b80742 FIX Disable ticket status change if ticket close 
FIX Use ref into label of ticket message
 2020-02-07 11:52:55 +01:00
Laurent Destailleur
13442ef0df FIX Filenames must not contains non ascii char or we will get non ascii 
char into the SMTP header.
 2020-02-06 13:01:09 +01:00
Laurent Destailleur
05e08b3596 FIX Filenames must not contains non ascii char or we will get non ascii 
char into the SMTP header.
FIX Do not encode subject if it is full ascii (not required)
 2020-02-06 12:58:02 +01:00
Laurent Destailleur
dbb731a656
Merge pull request #12957 from TobiasSekan/AddTempWorkFolder 
NEW Hidden option MAIN_TEMP_DIR
 2020-02-05 20:43:26 +01:00
Laurent Destailleur
4a07740601
Update conf.class.php 2020-02-05 20:42:44 +01:00
Laurent Destailleur
7cc959e316
Update conf.class.php 2020-02-05 20:42:03 +01:00
stickler-ci
1ecef695f8 Fixing style errors. 2020-02-05 19:40:22 +00:00
Laurent Destailleur
3e73e97f24
Update conf.class.php 2020-02-05 20:39:38 +01:00
Laurent Destailleur
98ac0428a5
Update conf.class.php 2020-02-05 20:37:49 +01:00
Laurent Destailleur
fdfc45bbe9 Fix wrapping 2020-02-05 15:04:11 +01:00
andreubisquerra
220f02805d Update image path after move image directory 
We need change path after move image in the commit:
de4183ea65 (diff-7af3f43d430a17d6e548d766fbacecc2)

Conflicts:
	htdocs/core/class/dolreceiptprinter.class.php
 2020-02-05 14:12:29 +01:00
Laurent Destailleur
320dd69923
Merge pull request #13002 from andreubisquerra/develop 
Update image path after move image directory
 2020-02-05 14:10:12 +01:00
andreubisquerra
e6dc384ee9
Add bold tags 2020-02-03 19:33:23 +01:00
Laurent Destailleur
97d726733c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/includes/tecnickcom/tcpdf/tcpdf.php
 2020-02-03 06:36:43 +01:00
Laurent Destailleur
d8ed62ea33 Fix line_max for BOM 2020-02-03 06:28:51 +01:00
Laurent Destailleur
e5808e3335 FIX #12995 2020-02-03 04:48:17 +01:00
Laurent Destailleur
1dab308e4a FIX #12932 2020-02-03 03:55:37 +01:00
andreubisquerra
a4c1c00728
Update image path after move image directory 
We need change path after move image in the commit:
de4183ea65 (diff-7af3f43d430a17d6e548d766fbacecc2)
 2020-02-02 21:02:43 +01:00
Laurent Destailleur
2dd1e34c2d Fix phpcs 2020-01-31 19:01:31 +01:00
Laurent Destailleur
ad6758c4da Fix bad var 2020-01-31 18:03:45 +01:00
Laurent Destailleur
f752551914 WIP Generic stats page 2020-01-31 14:53:47 +01:00
Laurent Destailleur
51c6540a56 WIP Advanced search 2020-01-30 23:28:50 +01:00
Laurent Destailleur
c0bf89929f Code comment 2020-01-30 19:14:59 +01:00
Laurent Destailleur
b47e1bd8e8 Fix protection when creating extrafield of type separator 2020-01-30 18:47:41 +01:00
Laurent Destailleur
7b92aaa115 Fix templateResult into templateSelection 2020-01-30 18:45:50 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
4b0ca24ca3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-29 23:08:51 +01:00
Laurent Destailleur
7b10c2440b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-29 23:08:42 +01:00
Laurent Destailleur
af61c19ffd Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-01-29 23:06:21 +01:00
Laurent Destailleur
e13f1509b3
Merge pull request #12965 from frederic34/patch-6 
Update extrafields.class.php
 2020-01-29 22:57:01 +01:00
Laurent Destailleur
1e879126cd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/exports/class/export.class.php
 2020-01-29 19:28:06 +01:00
Laurent Destailleur
60f772d285 FIX Pending amount to pay must be zero if invoice close for anticipated 
payment.
 2020-01-29 17:56:09 +01:00
Frédéric FRANCE
dcc8b4b65e
Update extrafields.class.php 2020-01-29 15:35:46 +01:00
Laurent Destailleur
1e13f6fd0f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/resource/class/dolresource.class.php
	htdocs/resource/list.php
 2020-01-29 11:44:04 +01:00
altairis
3c3876eb59 FIX : default lang selection when filter 2020-01-29 11:32:24 +01:00
Tobias Sekan
8b3eb35cd1
[NEW] Hidden option MAIN_TEMP_DIR 2020-01-29 10:55:56 +01:00
VESSILLER
7cdd334995 FIX require category class in extrafield 2020-01-28 11:37:23 +01:00
Tobias Sekan
713fb1a290
Fix additional space after card name 2020-01-28 08:55:49 +01:00
Laurent Destailleur
4a5dca4a3d Fix test 2020-01-26 23:48:40 +01:00
Laurent Destailleur
d6830e0d04
Merge pull request #12818 from glafarge/patch-1 
New : Add native spellcheck to CKEditor
 2020-01-26 23:31:27 +01:00
Laurent Destailleur
fd50074b42
Update doleditor.class.php 2020-01-26 23:31:19 +01:00
Laurent Destailleur
8ff19a2a0f WIP search component 2020-01-26 22:02:31 +01:00
Laurent Destailleur
30a5ab479f Can choose text to show when there is no data 2020-01-25 22:43:24 +01:00
Laurent Destailleur
0f2141269a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-01-25 14:43:57 +01:00
Laurent Destailleur
06731bdd59 Fix phpcs 2020-01-25 14:40:16 +01:00
Laurent Destailleur
09f809f347 FIX #12913 2020-01-25 14:03:24 +01:00
Laurent Destailleur
08d8670bb3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/class/product.class.php
 2020-01-24 20:12:27 +01:00
Laurent Destailleur
779cd94b0e Debug cashfence feature 2020-01-24 15:26:18 +01:00
Laurent Destailleur
540713510e Fix load of segment prices not required for virtual stock change 
virtual stock must include production (WIP)
 2020-01-23 21:03:15 +01:00
Laurent Destailleur
12b4909c45 Fix load of segment prices not required for virtual stock change 
virtual stock must include production (WIP)
 2020-01-23 20:59:18 +01:00
Laurent Destailleur
27a0858050 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
 2020-01-23 17:41:31 +01:00
Laurent Destailleur
b3bbb23dae Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/smtps.class.php
 2020-01-23 17:38:14 +01:00
Laurent Destailleur
8030558117 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/smtps.class.php
 2020-01-23 17:34:40 +01:00
Laurent Destailleur
7ee37ddd3f FIX Error in log for email sending with smtps was not complete 2020-01-23 17:30:05 +01:00
Laurent Destailleur
57569604b2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-22 14:11:53 +01:00
Laurent Destailleur
d3411a79ef Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-22 14:11:44 +01:00
Laurent Destailleur
4686be34d2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/stripe/charge.php
 2020-01-22 14:10:46 +01:00
Laurent Destailleur
46df9e59ab
Merge pull request #12888 from andreubisquerra/master 
Fix escpos DummyConnector
 2020-01-22 13:56:43 +01:00
Laurent Destailleur
443e4e2223
Update html.form.class.php 2020-01-22 13:44:42 +01:00
Laurent Destailleur
d94e091951 Can exclude some countries from list 2020-01-21 23:49:04 +01:00
Laurent Destailleur
ff9a2608d8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
 2020-01-21 22:22:16 +01:00
Laurent Destailleur
8f1737952d Fix search on accounting account when option to padd 0 is on. 2020-01-21 22:20:32 +01:00
Laurent Destailleur
a36b0ea4f5 Fix filter on parent account in list of accounting accounts 2020-01-21 21:36:40 +01:00
John Botella
d6766af35d Fix dom and missing param 2020-01-21 14:17:53 +01:00
Laurent Destailleur
a9790f355d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-21 11:32:40 +01:00
Laurent Destailleur
4598538b42 Prepare PDF templates to use 2 languages for titles 2020-01-21 01:55:00 +01:00
Laurent Destailleur
d2cf4c55ee Fix label of status 2020-01-20 23:58:01 +01:00
Laurent Destailleur
92856788a3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-20 18:39:46 +01:00
Laurent Destailleur
cfc74db5bc FIX field 'private' on email templates was not managed. 2020-01-20 18:38:53 +01:00
Laurent Destailleur
18f2b09fb1 Debug v11 2020-01-20 12:25:25 +01:00
andreubisquerra
70362e7609
Fix travis 2020-01-19 16:44:33 +01:00
andreubisquerra
d4d0ef1295 Fix escpos DummyConnector 2020-01-19 16:16:59 +01:00
Laurent Destailleur
6fd717539d
Merge pull request #12887 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2020-01-18 20:21:29 +01:00
Laurent Destailleur
24d439845b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
 2020-01-18 20:20:25 +01:00
Laurent Destailleur
d9f7c4aec4 FIX #12838 2020-01-18 19:53:48 +01:00
Scrutinizer Auto-Fixer
8744f6ab7b Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-18 15:17:07 +00:00
Laurent Destailleur
908a012c21 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-16 18:13:46 +01:00
Laurent Destailleur
c556f60c89 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-16 18:13:35 +01:00
Laurent Destailleur
d7423c23de Doc 2020-01-16 12:34:53 +01:00
Scrutinizer Auto-Fixer
0aa156db78 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-16 01:54:00 +00:00
Laurent Destailleur
2c40e4be94 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-15 20:13:45 +01:00
Norbert Penel
3c2dd7db7c Fix modulbuilder create forms 
'fk_product' => array('type' => 'integer:Product:product/class/product.class.php' ...
the input was arriving with a select2 instead of an ajax search
 2020-01-15 20:11:34 +01:00
Laurent Destailleur
28d5901da4 Fix error of mysqldump not thrown in some cases 2020-01-15 16:45:13 +01:00
Laurent Destailleur
373420edc0
Merge pull request #12476 from ptibogxiv/patch-280 
NEW add total of value in product stat
 2020-01-15 14:11:01 +01:00
Laurent Destailleur
486bb5cd0b Removed useless include 2020-01-15 13:24:23 +01:00
Laurent Destailleur
43bf0a79e6
Merge pull request #12770 from guillaumematheron/develop 
NEW 2 new options when creating an invoice from time spent on a project : by period or by task
 2020-01-15 13:23:25 +01:00
Laurent Destailleur
e58c2c5110 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-15 12:26:48 +01:00
Laurent Destailleur
1d3d26e185 Fix phpcs 2020-01-15 12:26:11 +01:00
Laurent Destailleur
03a1897089 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/stocks.lang
 2020-01-13 13:44:32 +01:00
Laurent Destailleur
2465d5ab47
Merge pull request #12837 from laudeco/hotfix/replenish_product 
replenish product
 2020-01-13 13:18:28 +01:00
Laurent Destailleur
9c9b73e4d1 Fix translation of \n and \\s into language files. 2020-01-13 13:11:25 +01:00
Laurent Destailleur
ce17f65b08
Merge pull request #12829 from atm-florian/11.0 
Fix Warning
 2020-01-13 11:39:05 +01:00
Laurent De Coninck
66e08103de
change the PHPdoc 2020-01-13 10:43:39 +01:00
Laurent Destailleur
22d4f37e58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/class/html.form.class.php
 2020-01-10 14:31:37 +01:00
Laurent Destailleur
b47db086cb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/inventory/class/inventory.class.php
	htdocs/product/inventory/list.php
 2020-01-10 14:30:42 +01:00
Laurent Destailleur
d97a59ac4a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	ChangeLog
	htdocs/comm/remise.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
	htdocs/variants/combinations.php
 2020-01-10 14:25:26 +01:00
Laurent Destailleur
c4d62e0ea3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/list.php
 2020-01-10 13:51:29 +01:00
Laurent Destailleur
22b6828e09
Merge pull request #12792 from aspangaro/12.0_a5 
NEW Accountancy - Add possibility to manage an short alternative label for account - Use to simplify accountancy
 2020-01-10 00:23:54 +01:00
Laurent Destailleur
286d278125
Merge pull request #12816 from artis-auxilium/fix_massaction_check 
Fix Check array of action after kooks
 2020-01-10 00:16:21 +01:00
Laurent Destailleur
f48c7d2ecf Fix modulebuilder 2020-01-09 22:31:23 +01:00