Laurent Destailleur
5392e11370
Add missing ethiopian birr currency
2021-02-11 23:05:01 +01:00
Laurent Destailleur
6dfc6c7edf
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/filefunc.inc.php
2021-02-11 18:33:03 +01:00
Laurent Destailleur
c306e8ebe9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-02-11 18:23:47 +01:00
Laurent Destailleur
e1334f34b6
Complete repair to clean not correctly available extrafields on proposal
2021-02-11 18:08:01 +01:00
Laurent Destailleur
2615d63024
Complete repair to clean not correctly available extrafields on proposal
2021-02-11 18:02:21 +01:00
Laurent Destailleur
1b11d9d0e9
FIX payment term label on PDF
2021-02-11 17:48:53 +01:00
Laurent Destailleur
09629d32d7
Fix missing properties in fetch
2021-02-11 14:53:29 +01:00
Laurent Destailleur
90d1b2d349
Prepare 12.0.5
2021-02-10 18:05:36 +01:00
Laurent Destailleur
8b125d8076
Fix MVC. Actions must be before output.
2021-02-10 16:44:20 +01:00
Laurent Destailleur
0849ce288c
Fix phpcs
2021-02-10 14:04:06 +01:00
Laurent Destailleur
c9b296ed57
Remove bad use
2021-02-10 13:51:18 +01:00
Laurent Destailleur
4f2e7c51fc
Fix #16129 autodetect language on public pages
2021-02-10 03:20:50 +01:00
Laurent Destailleur
89154265c6
FIX #16129
2021-02-10 03:12:19 +01:00
Laurent Destailleur
4c3a96da08
FIX #16150
2021-02-10 02:57:08 +01:00
Laurent Destailleur
13e0d08cbb
Code comment
2021-02-10 02:49:54 +01:00
Laurent Destailleur
d80f23589d
Fix missing entry
2021-02-10 02:39:58 +01:00
Laurent Destailleur
29100a4766
FIX #16221
2021-02-10 02:28:22 +01:00
Laurent Destailleur
667963094f
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-02-10 02:17:14 +01:00
Laurent Destailleur
c875ad9a1c
FIX #16240
2021-02-10 02:17:01 +01:00
Laurent Destailleur
2c30680157
Merge pull request #16244 from AlexisLaurier/13.0
...
fix regression of #16118 - entity not check on object in checkUserAccessToObject
2021-02-10 01:25:19 +01:00
Laurent Destailleur
1282494211
Merge pull request #16243 from ptibogxiv/patch-414
...
FIX update order by api
2021-02-10 01:17:33 +01:00
Laurent Destailleur
060e64fe02
FIX vat value when code contains number
2021-02-10 01:10:51 +01:00
Laurent Destailleur
408aefd46c
FIX vat value when code contains number
2021-02-10 01:10:31 +01:00
Laurent Destailleur
afeeb40e2e
Fix show property "enabled" of extrafields
2021-02-10 00:18:00 +01:00
Laurent Destailleur
33a4355743
Fix summary of report
2021-02-09 23:36:44 +01:00
Laurent Destailleur
92a1235066
Fix summary of report
2021-02-09 23:34:42 +01:00
Laurent Destailleur
6ceaa02abe
Fix total in summary section was empty for income.
2021-02-09 23:08:59 +01:00
Laurent Destailleur
3a9cf8eb7a
FIX: ODT generation very slow
2021-02-09 22:02:48 +01:00
Laurent Destailleur
032503f397
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/main.inc.php
2021-02-09 21:13:54 +01:00
Laurent Destailleur
9c535d6d7e
Fix comment in js must be a js comment
2021-02-09 21:09:46 +01:00
Laurent Destailleur
0e2c27d795
Fix javascript error
2021-02-09 21:06:11 +01:00
Laurent Destailleur
e1af57f540
FIX status late on purchase orders
2021-02-09 20:46:17 +01:00
LAURIER Alexis
0ae0eb5758
fix regression of #16118 - entity not check
...
Entity is not anymore check for user having permission $user->rights->societe->client->voir on the current entity. Then we can open object from any entity with current permissions and the entity field of objects are not anymore checked.
2021-02-09 20:13:13 +01:00
ptibogxiv
e5f6a64846
FIX update order by api
...
fix update shipping method and shipping date by API (no change with code or functionality juste fix this pb with updating)
2021-02-09 19:24:36 +01:00
Laurent Destailleur
eae232da50
Fix sql error
2021-02-09 19:16:26 +01:00
Laurent Destailleur
fdc2a88fc0
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-02-09 18:30:47 +01:00
Laurent Destailleur
e2d1813451
Fix column title wrapped
2021-02-09 18:30:34 +01:00
Laurent Destailleur
1f441deb5d
Merge pull request #16237 from AlexisLaurier/13.0
...
13.0 - Fix db begin() not closed into commande.class.php
2021-02-09 18:06:36 +01:00
Laurent Destailleur
2e6dde6209
Merge pull request #16239 from frederic34/patch-3
...
remove debug in V13
2021-02-09 18:05:54 +01:00
Frédéric FRANCE
07668167f6
Update card.php
2021-02-09 15:18:07 +01:00
Frédéric FRANCE
8d13e9231f
remove debug
2021-02-09 15:05:32 +01:00
LAURIER Alexis
abf2875eba
commande.class.php - move db->begin() into cloture
...
A DB begin request was sent before executing the status guard. If the guard fails, we exited the method without closing it. And it will occur a bug to any further database operation.
2021-02-09 14:25:45 +01:00
Laurent Destailleur
67fe91f6aa
Prepare 13.0.1
2021-02-09 14:15:21 +01:00
Laurent Destailleur
48a4ed656b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/projet/element.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2021-02-09 14:08:49 +01:00
Laurent Destailleur
a84bc05f01
Merge pull request #16146 from FHenry/12_fix_pricemin_PRODUIT_CUSTOMER_PRICES
...
FIX: manage price min for PRODUIT_CUSTOMER_PRICES
2021-02-09 13:39:25 +01:00
Laurent Destailleur
1efee54541
Merge pull request #16230 from FHenry/12_fix_error_assignement
...
12 fix error assignement
2021-02-09 13:22:57 +01:00
Laurent Destailleur
8acc5e1486
Fix calculation of profit
2021-02-08 23:37:32 +01:00
Laurent Destailleur
9453caa5be
Avoid message when not required
2021-02-08 22:12:12 +01:00
Florian HENRY
6bcb63c53d
fix indent
2021-02-08 20:46:59 +01:00
Florian HENRY
ff6b5c768d
fix indent
2021-02-08 20:46:21 +01:00