Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
84,091 Commits 36 Branches 189 Tags
d9a002a8bd3449b6ece2fde0798d4629eb068045
Commit Graph

7743 Commits

Author SHA1 Message Date
Laurent Destailleur
b48f08dd07 Theme v11 2019-10-23 20:12:29 +02:00
Laurent Destailleur
a8ca8c7a1f Fix edit of extrafields link when empty 2019-10-23 16:38:15 +02:00
Laurent Destailleur
9a386da7f5 NEW Can crop/resize image attached on a bank record 2019-10-23 16:07:09 +02:00
Laurent Destailleur
c4be61c55c FIX Better compatible fix for the trouble of weight / size units 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/card.php
 2019-10-22 18:42:59 +02:00
Laurent Destailleur
e7e9898e0d FIX Better compatible fix for the trouble of weight / size units 2019-10-22 18:36:36 +02:00
Laurent Destailleur
b88968520b Move code of extrafields to the new architecture 2019-10-22 17:08:37 +02:00
Laurent Destailleur
5ad7ca5620 Code more generic around setting projet on a card 2019-10-22 13:43:24 +02:00
Laurent Destailleur
9be9f912af Merge pull request #12192 from Ahuahuachi/develop 
Translate documentation and minor code improvement
 2019-10-22 12:32:40 +02:00
Tim Otte
ad51e862e4 Merged 2019-10-22 11:39:32 +02:00
Tim Otte
ceb3482204 Requested changes implemented 2019-10-22 11:36:28 +02:00
Laurent Destailleur
aa4afcfe8a NEW Can set a filter on object linked in modulebuilder. 2019-10-22 03:49:09 +02:00
Laurent Destailleur
6aa2ceac1a Fix phpcs 2019-10-22 02:53:29 +02:00
Laurent Destailleur
8e474701c1 Fix missing token 2019-10-21 15:49:08 +02:00
Laurent Destailleur
e261d63295 NEW Can add a button "Create" after combo of object with modulebuilder. 2019-10-21 14:44:39 +02:00
Laurent Destailleur
528ded58cf Merge pull request #12187 from c3do/develop 
NEW Add API to get Country by code and iso
 2019-10-20 21:26:44 +02:00
Alfredo Altamirano
d921b08e5c Translate documentation of translate class 2019-10-20 11:44:07 -05:00
Frédéric FRANCE
86f22c4563 do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Frédéric FRANCE
9ec7836387 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-20 16:37:18 +02:00
Laurent Destailleur
5a4960f7ae Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/takepos/takepos.php
 2019-10-20 15:30:28 +02:00
c3do
4fb0d03500 NEW Add API to get Country by code and iso 2019-10-20 15:25:18 +02:00
Laurent Destailleur
49c101bb77 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-20 15:16:51 +02:00
Laurent Destailleur
d79114c1f8 Clean code 2019-10-20 15:16:40 +02:00
Laurent Destailleur
8ce6197314 Update commondocgenerator.class.php 2019-10-20 14:37:15 +02:00
Laurent Destailleur
1b3d6d749a Merge pull request #12175 from Shnoulle/develop 
Close #12098 : allow usage of AUTH LOGIN in smtp
 2019-10-20 13:48:24 +02:00
Laurent Destailleur
e95861c361 Update smtps.class.php 2019-10-20 13:48:01 +02:00
Laurent Destailleur
3b5e62947d Update smtps.class.php 2019-10-20 13:44:28 +02:00
Laurent Destailleur
84f6fd64a9 Merge pull request #12176 from Ahuahuachi/develop 
Translation of some function documentation
 2019-10-20 13:31:25 +02:00
Frédéric FRANCE
360bf55f5b clean indent 2019-10-20 01:09:11 +02:00
Alfredo Altamirano
9d9961e936 Translate documentation 2019-10-19 16:55:27 -05:00
Alfredo Altamirano
1ede09c21a Fix typo 2019-10-19 11:17:53 -05:00
Denis Chenu
88100a53aa Close #12098 : allow usage of AUTH LOGIN in smtp 
Global variable MAIL_SMTP_AUTH_TYPE can be used to PLIAN to allow AUTH PLAIN authentification. Default still AUTH LOGIN.
 2019-10-18 17:35:52 +02:00
Frédéric FRANCE
f4540dddb8 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-17 20:24:04 +02:00
Laurent Destailleur
f85899742b Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
 2019-10-17 17:48:42 +02:00
Laurent Destailleur
c64a537bfd Merge pull request #12155 from frederic34/patch-14 
Update html.formticket.class.php
 2019-10-17 17:42:30 +02:00
Laurent Destailleur
40a9b95696 Merge pull request #12148 from homer8173/patch-7 
use current local time on Now button
 2019-10-17 17:41:16 +02:00
Laurent Destailleur
084ab53b4b Fix translation 2019-10-17 12:14:38 +02:00
Frédéric FRANCE
46d2bf3317 Update html.formticket.class.php 2019-10-16 23:18:14 +02:00
Frédéric FRANCE
219a4b4374 Update html.formticket.class.php 2019-10-16 23:08:04 +02:00
Frédéric FRANCE
701afc99e9 Update html.formticket.class.php 2019-10-16 23:03:59 +02:00
Frédéric FRANCE
4bc0a6db2d Update html.formticket.class.php 2019-10-16 22:56:29 +02:00
Frédéric FRANCE
e75f7d448c Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
8a7a0b80e2 Fix remove warnings 2019-10-16 19:08:31 +02:00
Laurent Destailleur
41dd53170e Code comment 2019-10-16 19:07:17 +02:00
stickler-ci
fce1f1991c Fixing style errors. 2019-10-16 12:34:42 +00:00
Norbert Penel
8d75e83e55 use current local time on Now button 
use current local time for feed the date according to locale settings
 2019-10-16 14:32:17 +02:00
stickler-ci
bba042c0c3 Fixing style errors. 2019-10-16 10:34:47 +00:00
Norbert Penel
8d49609549 Fix user time instead of server time 
it seems that we want to use a user time by clicking on now button.

IDEA : may i use client time ??? because if page is old, the now button insert an old time.
 2019-10-16 12:28:50 +02:00
Laurent Destailleur
b0355dd149 Module BOM have now status DRAFT, VALIDATED, DISABLED 2019-10-16 01:20:58 +02:00
Frédéric FRANCE
d1d9b1ed85 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-15 09:39:57 +02:00
Laurent Destailleur
a1c93cb2e6 MAIN_ACTIVATE_HTML5 is now always on now (so option removed). 
Look and feel v11
 2019-10-15 02:45:12 +02:00