Laurent Destailleur
|
04d33f4594
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2022-03-10 15:51:42 +01:00 |
|
Laurent Destailleur
|
af6e95aa79
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/class/utils.class.php
|
2022-03-10 15:49:51 +01:00 |
|
Laurent Destailleur
|
5d942c9d1a
|
Fix infinit logs
|
2022-03-10 15:46:00 +01:00 |
|
Laurent Destailleur
|
aa80be975e
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/product/class/product.class.php
|
2022-03-10 14:10:18 +01:00 |
|
Laurent Destailleur
|
32a68995d6
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/product/class/product.class.php
|
2022-03-10 14:08:19 +01:00 |
|
Laurent Destailleur
|
f6cfe0557b
|
FIX exclusion of other backup files into backup file
Conflicts:
htdocs/admin/tools/export_files.php
|
2022-03-10 14:04:16 +01:00 |
|
Laurent Destailleur
|
cc57d3dbc1
|
Fix phpcs
|
2022-03-09 22:25:29 +01:00 |
|
Gauthier PC portable 024
|
f2aaa27d7b
|
FIX : when we use ajax select product fourn price on supplier order for example, unitprice should be rounded with MU and not MT
|
2022-03-09 17:41:48 +01:00 |
|
kamel
|
1f00dff4da
|
Correction Stickler CI / stickler-ci
|
2022-03-09 11:40:26 +01:00 |
|
kamel
|
e06c386507
|
Fix errors propagation and trigger position on delete proposal line
|
2022-03-09 11:32:07 +01:00 |
|
Ferran Marcet
|
8e944b8b6d
|
Fix: Error whem generating supplier payment pdf
|
2022-03-08 17:34:51 +01:00 |
|
Ferran Marcet
|
aa0c5cd22e
|
Merge branch '14.0up' into 14.0
# Conflicts:
# htdocs/core/modules/modAdherent.class.php
# htdocs/core/modules/modBom.class.php
# htdocs/core/modules/modCommande.class.php
# htdocs/core/modules/modFournisseur.class.php
# htdocs/core/modules/modProduct.class.php
# htdocs/core/modules/modProjet.class.php
# htdocs/core/modules/modPropale.class.php
# htdocs/core/modules/modResource.class.php
# htdocs/core/modules/modService.class.php
# htdocs/core/modules/modSociete.class.php
# htdocs/core/modules/modUser.class.php
|
2022-03-08 17:32:50 +01:00 |
|
Marc de Lima Lucio
|
f837845c12
|
FIX: still prevent project creation if PROJECTLEADER role unavailable, but with a specific error message
|
2022-03-08 15:07:02 +01:00 |
|
Marc de Lima Lucio
|
e989371651
|
FIX: better error management at product selling price update
|
2022-03-08 14:49:26 +01:00 |
|
lvessiller
|
19ad231012
|
FIX stickler-ci
|
2022-03-08 12:02:05 +01:00 |
|
lvessiller
|
397776d4a4
|
FIX check mandatory thirdparty fields for mass action
|
2022-03-08 11:29:01 +01:00 |
|
Alexandre SPANGARO
|
87b187bded
|
FIX #20279 Accountancy - PostGreSQL - Error on mass update lines already binded
|
2022-03-08 03:43:40 +01:00 |
|
Laurent Destailleur
|
c0088191f1
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/product/admin/product.php
htdocs/product/class/product.class.php
|
2022-03-07 15:19:51 +01:00 |
|
Laurent Destailleur
|
d13ae9f721
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
htdocs/product/admin/product.php
htdocs/product/class/product.class.php
|
2022-03-07 15:13:25 +01:00 |
|
Laurent Destailleur
|
40b2beff2d
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
|
2022-03-07 15:06:37 +01:00 |
|
Laurent Destailleur
|
c4061e578d
|
Fix field
|
2022-03-07 15:06:24 +01:00 |
|
Laurent Destailleur
|
028fc4f004
|
Fix field
|
2022-03-07 15:05:45 +01:00 |
|
Laurent Destailleur
|
df0b20aad3
|
Merge pull request #20241 from noec764/12.0_Product_Fournisseur_Migration
Correction of the modification on the fly of the table llx_product_fournisseur_price
|
2022-03-07 15:01:40 +01:00 |
|
Laurent Destailleur
|
e085c3989a
|
Update product.php
|
2022-03-07 14:59:55 +01:00 |
|
Laurent Destailleur
|
5a1163c9b9
|
Merge pull request #20257 from FHenry/14_fix_user_mo
FIX: User name in ManufacturingOrder
|
2022-03-07 14:25:20 +01:00 |
|
Laurent Destailleur
|
35e8e370b1
|
Merge pull request #20269 from atm-gauthier/14.0_fix_refund_tva
FIX : in case of TVA refund, negative amount must be allowed
|
2022-03-07 14:14:54 +01:00 |
|
Laurent Destailleur
|
e67c208b57
|
Merge pull request #20271 from rycks/12.0
fix #20270 : use product_id in sql only if product_id is defined
|
2022-03-07 14:07:27 +01:00 |
|
Laurent Destailleur
|
e13038dc30
|
Update product.class.php
|
2022-03-07 14:06:54 +01:00 |
|
Laurent Destailleur
|
792dcc6334
|
FIX creation of the shipment if order contains services - 2/2
|
2022-03-04 19:14:57 +01:00 |
|
Noé Cendrier
|
cfabaea645
|
translation refining
|
2022-03-04 17:38:39 +01:00 |
|
Noé Cendrier
|
e4f4a07fc6
|
correct mass action "classify delivered"
|
2022-03-04 17:31:04 +01:00 |
|
Laurent Destailleur
|
444abbbc0e
|
Fix regression
|
2022-03-04 16:44:33 +01:00 |
|
Eric Seigne
|
744b84cb09
|
fix #20270 : use product_id in sql only if product_id is defined
|
2022-03-04 15:20:50 +01:00 |
|
Gauthier PC portable 024
|
7701ae2d19
|
FIX : in case of TVA refund, negative amount must be allowed
|
2022-03-04 13:55:52 +01:00 |
|
Florian HENRY
|
801402f46a
|
fix: #20267
|
2022-03-04 11:58:52 +01:00 |
|
Florian HENRY
|
3b06a08aa0
|
FIX: User name in ManufacturingOrder
|
2022-03-03 13:56:10 +01:00 |
|
Marc de Lima Lucio
|
7239fa3605
|
FIX: project creation prevented if PROJECTLEADER contact role renamed, de-activated or deleted
|
2022-03-03 12:19:47 +01:00 |
|
stickler-ci
|
5c3b0847c2
|
Fixing style errors.
|
2022-03-01 15:20:28 +00:00 |
|
noec764
|
f1af7ca2f2
|
Update product.php
|
2022-03-01 16:17:32 +01:00 |
|
Noé Courtier
|
035bc32323
|
Correction of the modification on the fly of the table llx_product_fournisseur_price by an addition in the script creation of the table as well as in the script of version upgrade from 12 ->13
|
2022-03-01 16:14:31 +01:00 |
|
Marc de Lima Lucio
|
e3aae6d2e1
|
FIX: object cloning: set unique extrafield values to null to prevent duplicates
|
2022-03-01 10:50:22 +01:00 |
|
Laurent Destailleur
|
70a18bc15a
|
FIX creation of the shipment if order contains services
|
2022-03-01 01:28:47 +01:00 |
|
Laurent Destailleur
|
0aa7e7df88
|
Fix translation on ticket
|
2022-03-01 00:33:24 +01:00 |
|
Laurent Destailleur
|
20a35147d4
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
|
2022-02-28 22:22:46 +01:00 |
|
Laurent Destailleur
|
df9fa39d34
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2022-02-28 22:22:10 +01:00 |
|
Laurent Destailleur
|
81e0eb3af0
|
Merge pull request #20128 from atm-greg/FIX_14.0_missing_hook_receptionlist
fix missing hooks and line total for totalizable extrafields
|
2022-02-28 22:14:11 +01:00 |
|
Laurent Destailleur
|
c1268a3e39
|
Merge pull request #20151 from aspangaro/14p34
FIX Invoice - When you create an invoice and defined a thirdparty, fk_account is not retrieved from company card
|
2022-02-28 21:38:07 +01:00 |
|
Laurent Destailleur
|
b7d20ff20b
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
|
2022-02-28 21:34:17 +01:00 |
|
Laurent Destailleur
|
548cad0508
|
FIx #20110
|
2022-02-28 21:30:12 +01:00 |
|
Laurent Destailleur
|
0bdf720ed4
|
Merge pull request #20224 from atm-greg/Fix_extrafields_view_and_perms_on_list
Fix extrafields view and perms on list
|
2022-02-28 21:17:19 +01:00 |
|