Laurent Destailleur
46df9e59ab
Merge pull request #12888 from andreubisquerra/master
...
Fix escpos DummyConnector
2020-01-22 13:56:43 +01:00
Laurent Destailleur
839f1b83fd
Merge pull request #12901 from OPEN-DSI/new-product-list-units-columns
...
NEW columns units in product list
2020-01-22 13:55:50 +01:00
Laurent Destailleur
a1e3e44b1d
Merge pull request #12897 from homer8173/patch-16
...
FIX : multicompany, impossible to add second task
2020-01-22 13:49:46 +01:00
Laurent Destailleur
3c62dd0a3d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-22 13:41:17 +01:00
Laurent Destailleur
395b9bf7ac
Fix syntax error
2020-01-22 13:41:05 +01:00
Laurent Destailleur
ee70e6fe36
Merge pull request #12906 from frederic34/patch-8
...
retrieve extrafields oldline when updating line
2020-01-22 13:39:17 +01:00
Frédéric FRANCE
3ce077320c
retrieve extrafields oldline when updating line
2020-01-22 10:23:31 +01:00
Laurent Destailleur
b6e7b228ee
Removed useless vars in setup
2020-01-22 01:24:04 +01:00
Laurent Destailleur
f22ad9a9bf
Add column eec in table of countries
2020-01-22 00:36:04 +01:00
Laurent Destailleur
d94e091951
Can exclude some countries from list
2020-01-21 23:49:04 +01:00
Laurent Destailleur
d329c4ad38
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-21 22:39:30 +01:00
Laurent Destailleur
edc79e7398
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/admin/account.php
2020-01-21 22:39:01 +01:00
Laurent Destailleur
69fae5a679
Fix search on accounting account when option to padd 0 is on.
2020-01-21 22:38:03 +01:00
Laurent Destailleur
c7617279de
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-21 22:27:00 +01:00
Laurent Destailleur
80648db7fc
Fix search on accounting account when option to padd 0 is on.
2020-01-21 22:26:37 +01:00
Laurent Destailleur
ff9a2608d8
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
2020-01-21 22:22:16 +01:00
Laurent Destailleur
8f1737952d
Fix search on accounting account when option to padd 0 is on.
2020-01-21 22:20:32 +01:00
Laurent Destailleur
e3a21c55d1
Fix label
2020-01-21 21:37:10 +01:00
Laurent Destailleur
a36b0ea4f5
Fix filter on parent account in list of accounting accounts
2020-01-21 21:36:40 +01:00
Laurent Destailleur
7e08dc17af
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-21 20:51:22 +01:00
Laurent Destailleur
fd02ed4317
Fix label
2020-01-21 20:50:58 +01:00
VESSILLER
8a348d533b
NEW only show units columns in product list (not in service list)
2020-01-21 17:29:45 +01:00
Laurent Destailleur
8bd835d937
NEW Add option PDF_USE_ALSO_LANGUAGE_CODE to generate PDF in 2 languages
...
in same document.
2020-01-21 16:17:18 +01:00
Laurent Destailleur
4922567a27
Add .noexec extension for old php4, php5... files
2020-01-21 15:02:04 +01:00
Laurent Destailleur
4fdfba3867
Add .noexec extension for old php4, php5... files
2020-01-21 15:01:22 +01:00
Laurent Destailleur
60a6dc5545
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-21 13:26:46 +01:00
Laurent Destailleur
6d50cc1899
Update demo profiles
2020-01-21 13:25:38 +01:00
Laurent Destailleur
b813a5a4e0
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-21 13:03:02 +01:00
Laurent Destailleur
4773c81ae1
Fix demo profiles
2020-01-21 13:01:49 +01:00
Laurent Destailleur
ca3e6ff60c
Doc
2020-01-21 12:46:28 +01:00
Laurent Destailleur
49e875aa96
Fix fatal error
2020-01-21 12:21:37 +01:00
Laurent Destailleur
a3a3835c76
Fix fatal error
2020-01-21 12:19:39 +01:00
Laurent Destailleur
a9790f355d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-21 11:32:40 +01:00
Laurent Destailleur
faf289cd13
Update demo
2020-01-21 11:32:17 +01:00
Laurent Destailleur
151a978105
Debug loan module
2020-01-21 11:25:51 +01:00
VESSILLER
70122411eb
FIX label Volume in comment
2020-01-21 11:02:14 +01:00
Laurent Destailleur
dc1600b3c2
Fix responsive
2020-01-21 10:54:31 +01:00
Laurent Destailleur
54a0d97891
Fix responsive
2020-01-21 10:48:15 +01:00
VESSILLER
0278cef2d7
NEW columns units in product list
2020-01-21 10:33:27 +01:00
Laurent Destailleur
f2ed97dada
Fix default value
2020-01-21 10:29:41 +01:00
Laurent Destailleur
c203e21966
Fix default values
2020-01-21 10:28:42 +01:00
Laurent Destailleur
4598538b42
Prepare PDF templates to use 2 languages for titles
2020-01-21 01:55:00 +01:00
Laurent Destailleur
ab5940f28c
Fix css lost
2020-01-21 00:56:32 +01:00
Laurent Destailleur
acdb28ba25
Add country id and country code in substitution vars
2020-01-21 00:28:53 +01:00
Laurent Destailleur
2d07a08e55
Fix init of specimen
2020-01-21 00:22:57 +01:00
Laurent Destailleur
d6e81c5da4
Fix var not defined
2020-01-21 00:20:18 +01:00
Laurent Destailleur
80483fc085
Fix init of specimen
2020-01-21 00:20:03 +01:00
Laurent Destailleur
d2cf4c55ee
Fix label of status
2020-01-20 23:58:01 +01:00
Norbert Penel
24cb739b7c
FIX : multicompany, impossible to add second task
...
due to ref already exists, it was impossible to add a second task on company > 1
this need to be fixed in all Dolibarr versions
All datas with more than 1 company are corrupted !
2020-01-20 18:54:35 +01:00
Laurent Destailleur
5b86851cf3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-20 18:46:52 +01:00