lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
90,510 Commits 43 Branches 150 Tags 886 MiB
05ac7c91c7
Commit Graph

90510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
stickler-ci
05ac7c91c7 Fixing style errors. 2020-10-14 16:25:23 +00:00
Florian HENRY
174bc67744 Merge branch 'dev_add_dict_NatureOfProductType' of github.com:FHenry/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 18:23:11 +02:00
Florian HENRY
4fd32325d6 cast int 2020-10-14 18:22:55 +02:00
stickler-ci
ee631e629f Fixing style errors. 2020-10-14 16:22:11 +00:00
Florian HENRY
9c3988da5c add show empty 2020-10-14 18:19:41 +02:00
Florian HENRY
bcb98d1d67 Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 18:16:34 +02:00
Florian HENRY
dfa2625de7 Merge branch 'dev_add_dict_NatureOfProductType' of github.com:FHenry/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 18:16:19 +02:00
Florian HENRY
50a9bd368c review 2020-10-14 18:15:48 +02:00
Laurent Destailleur
1e2fd359ac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-14 18:03:19 +02:00
Laurent Destailleur
fc69b88923 Update doc 2020-10-14 18:03:02 +02:00
Laurent Destailleur
034d3d7072
Merge pull request #15014 from amunaadh/develop 
[Tests-only] Added API tests for add users feature
 2020-10-14 17:54:51 +02:00
Laurent Destailleur
bb367a4489
Update dict.php 2020-10-14 17:40:27 +02:00
Laurent Destailleur
c079076488
Merge pull request #15010 from bafbes/abb120147 
fix:allow const files loading from modules inside custom folders
 2020-10-14 17:39:08 +02:00
Laurent Destailleur
a2a6ddaa66
Merge pull request #15008 from TobiasSekan/SelectableColumnsOnSalesTaxesList 
NEW Selectable columns on sales tax list
 2020-10-14 17:37:23 +02:00
Laurent Destailleur
afc0460a7f
Merge pull request #15006 from davidNDU/clone/develop 
Model Builder template/class/myobject.class.php faulty SQL statement
 2020-10-14 17:36:13 +02:00
Laurent Destailleur
a0f7aad591
Merge pull request #15019 from ATM-Nicolas/new_ecm_src_object_fields 
NEW : Fill ECM src object fields in dol_add_file_process
 2020-10-14 17:35:29 +02:00
Laurent Destailleur
ba001803ed
Update files.lib.php 2020-10-14 17:35:14 +02:00
Laurent Destailleur
820bf5b393
Merge pull request #15011 from bafbes/abb120348 
fix:boolean values in showinputfield function are 1 and 0 not 'on' and 'off'
 2020-10-14 17:18:02 +02:00
Laurent Destailleur
ee19f3fc94
Update actions_addupdatedelete.inc.php 2020-10-14 17:16:35 +02:00
Laurent Destailleur
bfe760ffcb
Merge pull request #15012 from bafbes/abb120349 
fix:two fields with same ids
 2020-10-14 17:15:24 +02:00
Laurent Destailleur
57aabfb3c5
Merge pull request #15013 from FHenry/dev_objectrefferent_for_BOM 
NEW display stat for BOM on "object referent"/linked Object product tab
 2020-10-14 17:14:47 +02:00
Laurent Destailleur
e423bbf823 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-14 17:11:58 +02:00
Laurent Destailleur
e8ea7125e5 Removed the FIXME. The dol_getdate can now use a timezone. 2020-10-14 17:11:22 +02:00
ATM-Nicolas
98eb11be62 NEW : Fill ECM src object fields in dol_add_file_process 2020-10-14 16:59:05 +02:00
Florian HENRY
fd1fa1c777 Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 16:39:54 +02:00
Florian HENRY
7d09f22afa add correct import and dict edition 2020-10-14 16:39:42 +02:00
Florian HENRY
940d478aec UI and db OK 2020-10-14 15:54:48 +02:00
Laurent Destailleur
3cf2b6b5eb Doc comment. 2020-10-14 15:01:50 +02:00
Laurent Destailleur
fe19eea540
Merge pull request #15007 from hregis/develop_bug2 
FIX avoid spaces in file name
 2020-10-14 14:45:40 +02:00
Florian HENRY
90df353f0c fix number of lines 2020-10-14 14:30:07 +02:00
Florian HENRY
a2ef7bc61e add select 2020-10-14 14:26:40 +02:00
Laurent Destailleur
a0b17635fd NEW When creating a user from a member linked to a thirdparty, you can 
decide if it is an internal or external (default) user.
 2020-10-14 14:02:07 +02:00
Florian HENRY
fdf81b2458 Merge github.com:Dolibarr/dolibarr into dev_objectrefferent_for_BOM 2020-10-14 12:26:18 +02:00
Florian HENRY
2d1d76b5a3 add credentials 2020-10-14 12:26:10 +02:00
Florian HENRY
77de8c242c commit add table 2020-10-14 12:24:35 +02:00
Laurent Destailleur
02fcee5d94 Fix make the default sender email mandatory into setup (if not defined, 
no emails can be sent).
 2020-10-14 12:21:31 +02:00
Florian HENRY
ca37827e72 Merge branch 'dev_objectrefferent_for_BOM' of github.com:FHenry/dolibarr into dev_objectrefferent_for_BOM 2020-10-14 11:20:48 +02:00
Florian HENRY
14a3e30270 fix travis 2020-10-14 11:20:27 +02:00
stickler-ci
8bfb04ea7f Fixing style errors. 2020-10-14 08:34:30 +00:00
Florian HENRY
08379cbfc6 Merge branch 'dev_objectrefferent_for_BOM' of github.com:FHenry/dolibarr into dev_objectrefferent_for_BOM 2020-10-14 10:32:07 +02:00
Florian HENRY
ee67d2b1a8 fixnhish bom product stats 2020-10-14 10:30:39 +02:00
Yamuna Adhikari
f46c0de35e
Merge pull request #6 from amunaadh/APItest_branch 
API test added for addUsers
 2020-10-14 13:04:27 +05:45
amunaadh
5d33761b13 API test added for addUsers 
Co-authored-by: Swikriti Tripathi <swikriti808@gmail.com>
 2020-10-14 13:03:38 +05:45
stickler-ci
7abb0caf91 Fixing style errors. 2020-10-14 06:47:16 +00:00
Florian HENRY
6ff58aafdc Merge github.com:Dolibarr/dolibarr into dev_objectrefferent_for_BOM 2020-10-14 08:43:07 +02:00
Florian HENRY
74155a49be finish BOM stat referent object 2020-10-14 08:42:57 +02:00
Laurent Destailleur
7838ca32ba Fix sql injection reported by Jason Nordenstam 2020-10-14 01:52:53 +02:00
Laurent Destailleur
4a3a3190ea Standardize pdf templates 2020-10-14 01:46:49 +02:00
bahfir abbes
8b0a6d7f40 fix:two fields with same ids is incorrect html 2020-10-14 00:21:12 +01:00
bahfir abbes
ad21f1e293 fix:boolean values in showinputfield are 1 and 0 not 'on' and 'off' 2020-10-14 00:15:51 +01:00