Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 00:21:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
89,109 Commits 39 Branches 191 Tags
9165ea9e673a0e4f743d43a627cda170ce5547eb
Commit Graph

78410 Commits

Author SHA1 Message Date
Laurent Destailleur
fa3ca5c644 Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-06-12 01:00:15 +02:00
Laurent Destailleur
012574b487 Update html.form.class.php 2020-06-12 00:51:19 +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
b36e658b20 Update html.formticket.class.php 2020-06-11 22:58:58 +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
Regis Houssin
997cb214f1 FIX avoid error "Call to undefined function measuringUnitString()" 2020-06-11 16:52:24 +02:00
Laurent Destailleur
503206af88 Fix analytics tag 2020-06-11 16:38:58 +02:00
Anthony Berton
4a77d06b1e o 2020-06-11 15:45:31 +02:00
Anthony Berton
182a34616f Add files via upload 2020-06-11 15:39:05 +02:00
Anthony Berton
848c9df537 Add files via upload 2020-06-11 15:38:05 +02:00
Anthony Berton
9d43827844 Revert "Delete html.form.class.php" 
This reverts commit aa275f2a79.
 2020-06-11 15:18:10 +02:00
Laurent Destailleur
a48f263af2 Fix phpcs 2020-06-11 13:58:12 +02:00
Laurent Destailleur
5bc9e656bf Fix phpcs 2020-06-11 13:03:21 +02:00
Laurent Destailleur
6a3547f8af css 2020-06-11 02:11:17 +02:00
Laurent Destailleur
5b882e333d Fix tooltip on localtaxes 2020-06-10 23:00:17 +02:00
Laurent Destailleur
e94ef09977 css 2020-06-10 22:24:15 +02:00
Laurent Destailleur
5e13a7f1e2 css 2020-06-10 22:05:49 +02:00
ATM john
564b9df1e7 Fix ticket file save 2020-06-10 17:01:57 +02:00
gauthier
58ff96af30 FIX : $arraydefaultmessage is an object, as well as in /htdocs/core/class/html.formmail.class.php 2020-06-10 16:48:02 +02:00
Florian Mortgat
5bc80f8626 FIX 11.0 - fatal with postgres because empty string literals are assigned to fields typed as integers as per UNION syntax 2020-06-10 16:22:48 +02:00
Laurent Destailleur
5794b1abea Fix for use with text browser 
Conflicts:
	htdocs/main.inc.php
 2020-06-10 12:46:55 +02:00
Laurent Destailleur
9bbdaffe9d FIX Sharing buttons 2020-06-10 12:45:02 +02:00
Laurent Destailleur
bd22ad4174 Fix for use with text browser 2020-06-10 12:35:39 +02:00
Laurent Destailleur
764b8a15de FIX Sharing buttons 2020-06-10 00:01:41 +02:00
Laurent Destailleur
4b2a570a23 Error message 2020-06-09 22:44:25 +02:00