Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-18 15:31:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
94,477 Commits 36 Branches 190 Tags
026e4548258febf35c66351c8ff7cb1556db84e7
Commit Graph

22973 Commits

Author SHA1 Message Date
Laurent Destailleur
6277422115 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-15 20:38:32 +02:00
Laurent Destailleur
4eddcb7503 Merge pull request #15023 from Ahuahuachi/10.0 
FIX #14927 Change ContratLigne property type to product_type
 2020-10-15 20:29:38 +02:00
Laurent Destailleur
3d68ab4059 Update box_services_contracts.php 2020-10-15 20:28:27 +02:00
Laurent Destailleur
24f7a8aeed Merge pull request #15028 from FHenry/fix_intracom 
fix table creation for intracom and change reserved name column name
 2020-10-15 20:19:05 +02:00
Laurent Destailleur
14a26c499f Merge pull request #15027 from ATM-Nicolas/fix_ecm_src_object_type 
FIX : Use table_element instead of element
 2020-10-15 20:14:39 +02:00
Laurent Destailleur
5b37ff0bfd Html entities use now HTML5. Enhance the Dolibarr WAF. More PHPUnit 
tests.
 2020-10-15 19:36:08 +02:00
Laurent Destailleur
844c4dec4d css 2020-10-15 13:16:17 +02:00
Florian HENRY
a0d1e96bfd fix table creation for intracom and change reserved name column name 2020-10-15 11:37:44 +02:00
ATM-Nicolas
20aee01fd8 FIX : Use table_element instead of element 2020-10-15 11:14:20 +02:00
ATM john
b9cbd84d4e Fix page break 2020-10-15 09:30:48 +02:00
Florian HENRY
109d1ab801 Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType 2020-10-15 08:25:46 +02:00
Alfredo Altamirano
4a3ffbb6d4 FIX #14927 Change ContratLigne property type to product_type 
This bug is produced because the ContratLigne class gives a property type instead of a product_type
 2020-10-14 22:17:50 -05:00
bahfir abbes
db5292e647 new:handle new type reference in add and update actions 2020-10-15 01:19:05 +01:00
Laurent Destailleur
0908ac5867 Fix phpcs 2020-10-14 20:18:07 +02:00
Laurent Destailleur
20d5098ce2 Fix regression in dol_getdate() 2020-10-14 19:42:17 +02:00
stickler-ci
05ac7c91c7 Fixing style errors. 2020-10-14 16:25:23 +00:00
Florian HENRY
4fd32325d6 cast int 2020-10-14 18:22:55 +02:00
Florian HENRY
bcb98d1d67 Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 18:16:34 +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
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
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
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
Laurent Destailleur
3cf2b6b5eb Doc comment. 2020-10-14 15:01:50 +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
stickler-ci
8bfb04ea7f Fixing style errors. 2020-10-14 08:34:30 +00:00
Florian HENRY
ee67d2b1a8 fixnhish bom product stats 2020-10-14 10:30:39 +02: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
ad21f1e293 fix:boolean values in showinputfield are 1 and 0 not 'on' and 'off' 2020-10-14 00:15:51 +01:00
bahfir abbes
4ee6cedbe6 Option d’Activation du fichier global de configuration. 2020-10-13 23:33:25 +01:00
Laurent Destailleur
d3b6ada4eb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
 2020-10-13 15:08:53 +02:00
Laurent Destailleur
bc6b5d919a Better responsive 2020-10-13 10:51:51 +02:00
Laurent Destailleur
7c67dbf6d5 Better responsive 2020-10-13 10:05:47 +02:00
Florian HENRY
4bf428fbf8 Merge github.com:Dolibarr/dolibarr into dev_objectrefferent_for_BOM 2020-10-13 08:13:54 +02:00
Laurent Destailleur
66a6415230 Merge pull request #14994 from grandoc/new_branch_12_10_2020 
fix : undefined index
 2020-10-12 19:37:37 +02:00
Laurent Destailleur
fcd4645509 Standardize code: Property product_libelle renamed into product_label 
Move common vars declaration into parent class.
 2020-10-12 19:33:00 +02:00
Philippe GRAND
4da75c4251 fix : undefined index 2020-10-12 16:11:56 +02:00
Laurent Destailleur
75997bb8f5 Minor fixes 2020-10-12 14:01:15 +02:00
Florian HENRY
739de365c0 load stat_bom 2020-10-12 13:52:50 +02:00
Laurent Destailleur
726fd1b631 Merge pull request #11227 from aspangaro/10.0_intracommreport 
NEW module Intracomm report
 2020-10-12 13:35:58 +02:00
Laurent Destailleur
a1dd922394 Update modProduct.class.php 2020-10-12 13:04:10 +02:00