Commit Graph

87844 Commits

Author SHA1 Message Date
Laurent Destailleur
df17c2f26a Removed dead code generating warning.
CSS
2020-11-28 16:48:32 +01:00
Laurent Destailleur
c6b2ee57ca Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	.travis.yml
2020-11-27 16:19:44 +01:00
Laurent Destailleur
5ed2bbb204 Fix error message 2020-11-27 16:13:27 +01:00
Laurent Destailleur
4a5cdd0092 Several fixes in export and repair tool 2020-11-27 15:27:35 +01:00
Laurent Destailleur
ac3c129735 Clean code 2020-11-27 14:24:15 +01:00
Laurent Destailleur
26f07992a9 Reduce travis load for v11 2020-11-27 00:27:52 +01:00
Laurent Destailleur
6de24e0c2e Reduce travis load for v12 2020-11-27 00:19:45 +01:00
Laurent Destailleur
4da4499569 FIX Param joinfiles not sanitized
Conflicts:
	htdocs/admin/mails_templates.php
2020-11-26 23:07:52 +01:00
Laurent Destailleur
b043442b91 Fix link and selection of status of purchase order. 2020-11-26 17:53:57 +01:00
Laurent Destailleur
22c2cfd9ec FIX warning for purchase order delivery late. 2020-11-26 16:57:39 +01:00
Laurent Destailleur
dfa161ca30 Fix property 2020-11-26 16:19:45 +01:00
Laurent Destailleur
3ccc9d3e57 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-26 15:29:57 +01:00
Laurent Destailleur
bd780a8c51 FIX Warning on late purchase order delivery 2020-11-26 15:29:18 +01:00
Laurent Destailleur
f91226a9f0
Merge pull request #15537 from maboelfotoh/maboelfotoh-fix-pr-13067
FIX #13067 including opening balance in calculation of displayed balance
2020-11-25 17:54:09 +01:00
Laurent Destailleur
168e35a035 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-25 17:29:09 +01:00
Laurent Destailleur
16e3baeff2 FIX filter on project list 2020-11-25 17:28:53 +01:00
Muhammad Aboelfotoh
551256b779 FIX #13067 including opening balance in calculation of displayed balance 2020-11-25 15:11:09 +00:00
Laurent Destailleur
c9371e9eb0
Merge pull request #15512 from fappels/12_fix_transfer_expline_extrafield
Fix issue #15506 tansfer line extrafield order  to expedition
2020-11-25 15:30:07 +01:00
Francis Appels
a734e1caa7 line is order line not exp line 2020-11-25 15:06:07 +01:00
Laurent Destailleur
3f1c00dcb2
Merge pull request #15517 from dumbbell/remove-PCG99-BASE-left-over-fields
Fix #15515: Getting errors when importing the "PCG99-BASE" accounts
2020-11-25 12:59:53 +01:00
Jean-Sébastien Pédron
9b1dbf8d2a
llx_accounting_account_fr.sql: Remove left over field data
In commit 86d9622360, the `pcg_subtype`
was removed from the inserted values.

In commit a85dfaf71e, values associated
with this field were removed. However, at least two lines in the
PCG99-BASE accounting accounts still had that field values.

This led to errors when importing the PCG99-BASE accounts. This patch
fixes the problem and the accounts can be imported successfully.
2020-11-24 22:19:21 +01:00
Laurent Destailleur
d17ecbeccd Fix #15438 2020-11-24 20:56:11 +01:00
Francis Appels
7eec1155a0 Fix issue #15506 tansfer line extrafield order to expedition 2020-11-24 18:58:37 +01:00
Laurent Destailleur
faa33f2d3c FIX #15501 2020-11-24 12:52:39 +01:00
Laurent Destailleur
817de18a5d Fix remove log 2020-11-24 12:25:32 +01:00
Laurent Destailleur
14ea3a1697 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-24 10:56:43 +01:00
Laurent Destailleur
53208e620e Use of . as thousand separator. Can use it for decimal if not 3 digits. 2020-11-24 10:56:05 +01:00
Laurent Destailleur
890f7a0602
Merge pull request #15497 from atm-john/12.0_fix_thirdparty_propagate_extrafields_to
FIX  Dol print error : conf usage thirdparty propagate extrafields to
2020-11-23 21:43:03 +01:00
Laurent Destailleur
5822fcfbed FIX several warning with the barcode use in ODT templates 2020-11-23 21:38:45 +01:00
Laurent Destailleur
9cb5673c36 Fix remove var_dump 2020-11-23 19:46:24 +01:00
Laurent Destailleur
c5278197fb More phpunit test for price2num 2020-11-23 19:45:11 +01:00
Laurent Destailleur
e7dbc8407f FIX formating of prices with foreign languages 2020-11-23 19:08:26 +01:00
ATM john
fbc911aea1 Fix conf usage thirdparty propagate extrafields to 2020-11-23 16:40:31 +01:00
Laurent Destailleur
3c84962891
Merge pull request #15472 from atm-florianm/FIX_12.0_CRON_methods_cant_be_called_without_params
Fix 12.0 cron methods cant be called without params
2020-11-21 23:39:39 +01:00
Florian Mortgat
6c75997b27 FIX wrong tab 2020-11-20 19:15:15 +01:00
Florian Mortgat
f7228d96af FIX 12.0 - when the cronjob 'params' field is empty, the cron method is called with one empty string param instead of no params at all 2020-11-20 19:12:59 +01:00
Laurent Destailleur
823e399d8d
Merge pull request #15428 from atm-quentin/FIX/actioncomm_desc_cant_be_empty
FIX cant empty action comm desc
2020-11-18 12:47:37 +01:00
Laurent Destailleur
4ae121d870 FIX Can't create shipment for virtual product. Add
STOCK_EXCLUDE_VIRTUAL_PRODUCTS as a quick hack to solve this.
2020-11-16 19:43:45 +01:00
quentin
6ce006f853 FIX cant empty action comm desc 2020-11-16 15:46:16 +01:00
Laurent Destailleur
217aa9c420 Clean CI 2020-11-15 23:50:11 +01:00
Laurent Destailleur
8ac3d5f9bf Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-15 23:49:22 +01:00
Laurent Destailleur
7fdc63faa6 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-11-15 23:48:52 +01:00
Laurent Destailleur
556888d55c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-11-15 23:48:18 +01:00
Laurent Destailleur
5e1cd459b1 Fix travis 2020-11-15 23:47:53 +01:00
Laurent Destailleur
b9192744cc Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-15 17:16:05 +01:00
Laurent Destailleur
30681f9179 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-15 17:15:56 +01:00
Laurent Destailleur
f101b3e43d
Merge pull request #15402 from BlueGarm/BlueGarm-Order-Partially-and-Delay
Add orders received partially and delay icons
2020-11-15 17:13:07 +01:00
Laurent Destailleur
dff5b13700
Merge pull request #15418 from atm-maxime/fix_ticket_list_filter
Fix #15377 ticket list filter on author
2020-11-15 17:01:47 +01:00
Maxime Kohlhaas
44c5988853 Fix #15377 ticket list filter on author 2020-11-15 10:42:15 +01:00
BlueGarm
2425cf82d3 Add Partially Received Order and Delay
Edit file to allow following order received partially and to upgrade lisibility of delayed orders
2020-11-14 13:25:02 +01:00