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

87329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
abb8cd260f Fix escape fields 2020-06-14 21:22:44 +02:00
Laurent Destailleur
c22a9781d8 Fix rounding 2020-06-14 21:21:18 +02:00
Laurent Destailleur
f0ca29cc6e Fix supplier sepa 2020-06-14 21:19:31 +02:00
Laurent Destailleur
b763b40d8c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-12 19:37:27 +02:00
Laurent Destailleur
2c327aae66 Prepare v12 2020-06-12 19:30:23 +02:00
Laurent Destailleur
8492272a08 Fix initdemo 2020-06-12 19:11:00 +02:00
Laurent Destailleur
b7e7ccee54 Update demo 2020-06-12 18:55:36 +02:00
Laurent Destailleur
c90ab62989 Fix We must include version into filename 2020-06-12 15:31:12 +02:00
Laurent Destailleur
2a20fc3968 Fix missing author into export_alias 2020-06-12 15:27:28 +02:00
Laurent Destailleur
c9cb978c39 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-12 15:21:06 +02:00
Laurent Destailleur
9bb5135317 Fix We never add .noexe of files into medias dir 2020-06-12 15:20:28 +02:00
Laurent Destailleur
acd0abf1ba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-12 14:36:34 +02:00
Laurent Destailleur
6e81542148 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-12 14:36:11 +02:00
Laurent Destailleur
5d5fb46af6 Fix We never add .noexe of files into medias dir 2020-06-12 14:35:50 +02:00
Laurent Destailleur
27a85a1971
Merge pull request #13799 from bb2a/PRODUCT_PRICE_BASE_TYPE 
NEW Can set type of price without tax) per defaut for new sale price creation
 2020-06-12 01:59:34 +02:00
Laurent Destailleur
cc9a964b5d
Update products.lang 2020-06-12 01:58:47 +02:00
Laurent Destailleur
a0b6d9c4e0 css 2020-06-12 01:19:50 +02:00
Laurent Destailleur
dc87d89204
Update 12.0.0-13.0.0.sql 2020-06-12 01:03:58 +02:00
Laurent Destailleur
c27eb5e623
Update llx_const.sql 2020-06-12 01:03:34 +02:00
Laurent Destailleur
fa3ca5c644
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-06-12 01:00:15 +02:00
Laurent Destailleur
77c1c46285
Merge pull request #14032 from ptibogxiv/patch-343 
NEW convert all subscription in datetime
 2020-06-12 00:47:55 +02:00
Laurent Destailleur
d7cbd8a1d4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-11 23:41:43 +02:00
Laurent Destailleur
90b5ed9908 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/website.lib.php
 2020-06-11 23:41:35 +02:00
Laurent Destailleur
e087edf005 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formticket.class.php
	htdocs/ticket/class/ticket.class.php
 2020-06-11 23:39:26 +02:00
Laurent Destailleur
e04557948d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-06-11 23:37:04 +02:00
Laurent Destailleur
2109a91992 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/takepos/admin/setup.php
 2020-06-11 23:36:55 +02:00
Laurent Destailleur
0023d14e65
Merge pull request #14037 from OPEN-DSI/v10-fix-takepos-free-text-html 
FIX free text on cash desk
 2020-06-11 23:33:31 +02:00
Laurent Destailleur
3527d011f5
Merge pull request #14006 from bafbes/abb110215 
fix:The label must be a dictionary key
 2020-06-11 23:15:52 +02:00
Laurent Destailleur
4b47a270af
Update index.php 2020-06-11 23:15:00 +02:00
Laurent Destailleur
073a4acd10
Merge pull request #14058 from indelog/showmailpj 
NEW Add show preview for mail attachement on form mail
 2020-06-11 23:09:26 +02:00
Laurent Destailleur
ffb345e724
Merge pull request #14062 from atm-florianm/11.0_FIX_missing_translation 
FIX: missing translation value for key "NoMorePredefinedProductToDispatch"
 2020-06-11 23:05:55 +02:00
Laurent Destailleur
83df96f7d1
Merge pull request #14054 from OPEN-DSI/fix-takepos-terminal-free-text 
FIX replace filter parameter "none" by "restricthtml" on cash desk
 2020-06-11 23:02:46 +02:00
Laurent Destailleur
9aafb82fd3
Merge pull request #14059 from atm-florianm/FIX_10.0_missing_global_langs_when_activating_modContrat 
FIX 10.0 - undefined $langs if template file copy fails during activation of modContrat
 2020-06-11 23:02:19 +02:00
Laurent Destailleur
3698af39f1
Merge pull request #14060 from indelog/fix_measuringunitstring 
Fix 11.0 -  undef func measuringUnitString() in From::select_produits_fournis…
 2020-06-11 23:02:01 +02:00
Laurent Destailleur
7d4a7a4be0
Merge pull request #14067 from atm-john/11.0_fix_ticket_file_save 
Fix ticket file save
 2020-06-11 23:01:33 +02:00
Laurent Destailleur
f1f37c7b29
Merge pull request #14064 from atm-florianm/FIX_11.0_postgresql_fatal_on_contact_agenda 
FIX 11.0 - fatal with postgres on contact/agenda.php
 2020-06-11 23:01:01 +02:00
Laurent Destailleur
e3811840df
Merge pull request #14066 from atm-gauthier/10.0_fix_arraydefaultmessage 
FIX : $arraydefaultmessage is an object, as well as in /htdocs/core/c…
 2020-06-11 22:59:55 +02:00
Laurent Destailleur
b36e658b20
Update html.formticket.class.php 2020-06-11 22:58:58 +02:00
Laurent Destailleur
7fcb62359d
Merge pull request #14072 from hregis/11.0_bug 
FIX avoid error "Call to undefined function measuringUnitString()"
 2020-06-11 22:56:17 +02:00
Anthony Berton
c00b55c980
Update 11.0.0-12.0.0.sql 2020-06-11 18:45:35 +02:00
Anthony Berton
bda4753e41
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-06-11 18:44:38 +02:00
Anthony Berton
94e7fc20be Create html.form.class.php 2020-06-11 18:41:52 +02:00
Anthony Berton
ce7767a154 Create 11.0.0-12.0.0.sql 2020-06-11 18:39:44 +02:00
Anthony Berton
3214b5f199 Merge branch 'PRODUCT_PRICE_BASE_TYPE' of https://github.com/bb2a/dolibarr into PRODUCT_PRICE_BASE_TYPE 2020-06-11 18:37:25 +02:00
Laurent Destailleur
ee611fa7a0 Fix bad definition of field for parent 2020-06-11 18:32:05 +02:00
Laurent Destailleur
c289001507 Fix bad definition of field for parent 2020-06-11 18:31:26 +02:00
Laurent Destailleur
c70cd01971 Fix css 2020-06-11 17:58:00 +02:00
Laurent Destailleur
3831b56423 Missing tags 2020-06-11 17:07:41 +02:00
Laurent Destailleur
78204f92e6 Fix tag 2020-06-11 17:00:22 +02:00
Laurent Destailleur
58fdd8a59a Fix tag at bad place 2020-06-11 16:59:24 +02:00