Philippe GRAND
|
db22cdb8ea
|
internationalization
|
2019-10-21 09:43:34 +02:00 |
|
Laurent Destailleur
|
6ebd9721da
|
FIX The Button "Automatic binding" did not use the account intracomm or
export.
|
2019-10-21 03:50:57 +02:00 |
|
Laurent Destailleur
|
9b1385ee86
|
FIX If country not defined keep value empty
|
2019-10-21 03:37:44 +02:00 |
|
Laurent Destailleur
|
a2b8aa55ad
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-10-21 00:56:04 +02:00 |
|
Laurent Destailleur
|
b21bca17de
|
Add button Save and stay when editing property of web site
|
2019-10-21 00:55:52 +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 |
|
Laurent Destailleur
|
2193e4b041
|
Merge pull request #12188 from frederic34/donotignoreblanklines
do not ignore lines with mix od tabs and spaces
|
2019-10-20 21:26:14 +02: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 |
|
c3do
|
bc6fb54798
|
New Add API to get List of Shipment methods
|
2019-10-20 15:56:27 +02:00 |
|
Laurent Destailleur
|
05352a62e5
|
css
|
2019-10-20 15:37:20 +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 |
|
Laurent Destailleur
|
45d64e468f
|
Fix regression
|
2019-10-20 15:29:15 +02:00 |
|
Laurent Destailleur
|
e224170dc2
|
FIX Clean the + of categories on the product view only in POS module
Conflicts:
htdocs/takepos/takepos.php
|
2019-10-20 15:27:09 +02:00 |
|
c3do
|
4fb0d03500
|
NEW Add API to get Country by code and iso
|
2019-10-20 15:25:18 +02:00 |
|
Laurent Destailleur
|
f999430fd3
|
FIX Clean the + of categories on the product view only in POS module
|
2019-10-20 15:24:52 +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
|
b813dfe3c9
|
Merge pull request #12172 from TobiasSekan/FixMissingIcalAuthor
Fix missing organizer and contact on ical export
|
2019-10-20 13:49:47 +02:00 |
|
Laurent Destailleur
|
89b0730483
|
Update actioncomm.class.php
|
2019-10-20 13:49:36 +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
|
05fed5358a
|
Merge pull request #12179 from c3do/develop
NEW Add API to get objects by ref, ref_ext, ...
|
2019-10-20 13:42:18 +02:00 |
|
Laurent Destailleur
|
54b7886331
|
Update api_orders.class.php
|
2019-10-20 13:40:18 +02:00 |
|
Laurent Destailleur
|
060535189b
|
Merge pull request #12185 from frederic34/patch-1
add empty line on mrp bom index.php
|
2019-10-20 13:32:33 +02:00 |
|
Laurent Destailleur
|
1f1945fc5c
|
Update index.php
|
2019-10-20 13:32:27 +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
|
5bcc4613a3
|
Merge pull request #12168 from frederic34/patch-15
Update card.php
|
2019-10-20 13:30:18 +02:00 |
|
Laurent Destailleur
|
1faea24eeb
|
Merge pull request #12183 from frederic34/longlines
cut long lines
|
2019-10-20 13:29:01 +02:00 |
|
Laurent Destailleur
|
24dc7fb667
|
Merge pull request #12173 from OPEN-DSI/new-product-clone-customer-prices
NEW add clone customers prices in clone product or service
|
2019-10-20 13:27:50 +02:00 |
|
Laurent Destailleur
|
e550acc688
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-10-20 13:22:38 +02:00 |
|
Laurent Destailleur
|
bf1b2242ea
|
Fix no focus if we are on edit mode directly
|
2019-10-20 13:22:29 +02:00 |
|
Laurent Destailleur
|
4906500f03
|
Merge pull request #12169 from frederic34/patch-16
Update don.class.php
|
2019-10-20 12:43:21 +02:00 |
|
Laurent Destailleur
|
9a4705aa4d
|
Merge pull request #12165 from frederic34/topnew
clean top menu xxx
|
2019-10-20 12:42:14 +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 |
|
Laurent Destailleur
|
b61b73b34c
|
Merge pull request #12186 from frederic34/scopeindent
clean indent
|
2019-10-20 12:39:57 +02:00 |
|
Frédéric FRANCE
|
e5ef19cd0e
|
restablish original rules
|
2019-10-20 12:10:07 +02:00 |
|
Frédéric FRANCE
|
7581275316
|
wip
|
2019-10-20 11:59:21 +02:00 |
|
Frédéric FRANCE
|
9af0995cfa
|
Merge remote-tracking branch 'origin/scopeindent' into scopeindent
|
2019-10-20 11:21:37 +02:00 |
|
Frédéric FRANCE
|
4d13c724d9
|
restablish original rules
|
2019-10-20 11:20:25 +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
|
66b0c27645
|
clean indent in commande dir
|
2019-10-20 09:58:31 +02:00 |
|
Frédéric FRANCE
|
4d7a18e1e0
|
restablish original rules
|
2019-10-20 01:13:45 +02:00 |
|
Frédéric FRANCE
|
360bf55f5b
|
clean indent
|
2019-10-20 01:09:11 +02:00 |
|
Alfredo Altamirano
|
0db96ed0b5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-10-19 16:56:05 -05:00 |
|