Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

18964 Commits

Author SHA1 Message Date
Laurent Destailleur
fea12076ee FIX #12152 2019-10-22 20:24:52 +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
8242281ef8 Close #12096 2019-10-22 14:39:33 +02:00
Laurent Destailleur
5ad7ca5620 Code more generic around setting projet on a card 2019-10-22 13:43:24 +02:00
Laurent Destailleur
b2bbee55f1 Fix phpcs 2019-10-22 12:37:36 +02:00
Laurent Destailleur
2eb5803644 Merge pull request #12196 from bb2a/patch-2 
Update functions.lib.php
 2019-10-22 12:36:47 +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
Laurent Destailleur
e5ee83ead1 Merge pull request #12194 from grandoc/new_branch_21_10_2019 
internationalization
 2019-10-22 12:31:48 +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
Anthony Berton
5e7d615250 Update functions.lib.php 2019-10-21 21:06:48 +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
3024919cd6 fix phpcs 2019-10-21 10:25:23 +02:00
Philippe GRAND
a0303e903a internationalization 2019-10-21 09:53:42 +02:00
Philippe GRAND
db22cdb8ea internationalization 2019-10-21 09:43:34 +02:00
Laurent Destailleur
6e9f3c3f9d Merge pull request #11084 from atm-florian/dev_MassSendEmailInvoiceToBillingContact 
NEW : mass email action on invoice list use billing contact if exists
 2019-10-20 21:45:37 +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
0ede817588 do not ignore lines with mix od tabs and spaces 2019-10-20 16:56:47 +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
Laurent Destailleur
9e7476cd1f Merge pull request #12171 from grandoc/new_branch_18_10_2019 
Standardization
 2019-10-20 13:30:40 +02:00
Laurent Destailleur
62a8523ccf Merge pull request #12178 from frederic34/patch-18 
Update functions2.lib.php
 2019-10-20 12:40:34 +02:00
Laurent Destailleur
ff30274a59 Merge pull request #12177 from frederic34/patch-17 
Update box_produits.php
 2019-10-20 12:40:10 +02:00
stickler-ci
66a2dc4994 Fixing style errors. 2019-10-20 09:18:55 +00:00
Frédéric FRANCE
33c35780e0 wip 2019-10-20 11:17:54 +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
Frédéric FRANCE
f0a3d1a1c4 Update functions2.lib.php 2019-10-18 23:20:34 +02:00
Frédéric FRANCE
486047c357 Update box_produits.php 2019-10-18 23:14:43 +02:00
Alfredo Altamirano
71f9b4f36b Translation of parameter documentation 2019-10-18 12:55:21 -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
Laurent Destailleur
becd3f7d2f FIX Missing status and paid flag in export or expense report 2019-10-18 15:35:25 +02:00
Philippe GRAND
a07ab341f8 Standardization 2019-10-18 13:00:31 +02:00
Philippe GRAND
41d2cb2c29 Standardization 2019-10-18 12:56:40 +02:00