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 |
|
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 |
|
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
|
3b06a08aa0
|
FIX: User name in ManufacturingOrder
|
2022-03-03 13:56:10 +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 |
|
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 |
|
Laurent Destailleur
|
e69b5ba086
|
Merge pull request #20223 from hregis/fix_no_special_code_option_for_invoice
FIX options should not exists on invoices
|
2022-02-28 20:36:36 +01:00 |
|
stickler-ci
|
c2047f1f5d
|
Fixing style errors.
|
2022-02-28 17:46:20 +00:00 |
|
atm-greg
|
bc8ea7571b
|
perms can be an expression and must be evaluated
|
2022-02-28 18:38:37 +01:00 |
|
atm-greg
|
5eef80750a
|
fiw visibility can be an expression and can return 0
|
2022-02-28 18:37:47 +01:00 |
|
Regis Houssin
|
9cf5bccf43
|
FIX options should not exists on invoices
|
2022-02-28 18:13:29 +01:00 |
|
Alexandre SPANGARO
|
18a8eac1cd
|
Modify fix
|
2022-02-26 07:17:44 +01:00 |
|
Laurent Destailleur
|
b989c257ad
|
Fix report on salaries
|
2022-02-25 18:53:21 +01:00 |
|
Laurent Destailleur
|
a6a6c588db
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
|
2022-02-25 14:37:28 +01:00 |
|
Laurent Destailleur
|
ac67a5a2bb
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
|
2022-02-25 14:34:25 +01:00 |
|
Laurent Destailleur
|
a70d45b3ab
|
Merge pull request #20148 from marc-dll/12.0_FIX_medias_blocked_when_logged_with_multicompany
FIX: viewimage.php blocks requests with multicompany from other enties
|
2022-02-25 14:32:49 +01:00 |
|
Laurent Destailleur
|
971c0fc764
|
Merge pull request #20147 from Hystepik/develop_safe_v14
Fix : fix error of permission in holiday
|
2022-02-25 14:30:05 +01:00 |
|
Laurent Destailleur
|
6dadfc9d0d
|
Merge pull request #20149 from marc-dll/13.0_FIX_pdf_deposit_detail
FIX: invoice pdf: lines originating from deposits were not detailed anymore
|
2022-02-25 14:29:33 +01:00 |
|
Laurent Destailleur
|
eb6383ff1d
|
Merge pull request #20165 from atm-lena/FIX_SalaryPaiement_RapportCompta
Display Salary Paiement on compta report
|
2022-02-25 14:02:32 +01:00 |
|
Laurent Destailleur
|
3eca04e85b
|
Merge pull request #20178 from thomas-Ngr/14.0_fix_bookmark_info_bubble
fix bookmarks info bubble
|
2022-02-25 13:34:01 +01:00 |
|
Laurent Destailleur
|
8c6f005ea1
|
Merge pull request #20195 from Dolibarr/revert-20193-14.0
Revert "NEW : accoutancy : subleger label input automatic filling when selecting subleger account in select2 list"
|
2022-02-25 13:22:10 +01:00 |
|
Laurent Destailleur
|
be95662ece
|
Revert "NEW : accoutancy : subleger label input automatic filling when selecting subleger account in select2 list"
|
2022-02-25 13:19:01 +01:00 |
|
Laurent Destailleur
|
1b72b27f75
|
Merge pull request #20193 from gdsoftdev/14.0
NEW : accoutancy : subleger label input automatic filling when selecting subleger account in select2 list
|
2022-02-25 13:18:56 +01:00 |
|
stickler-ci
|
c0dd96a456
|
Fixing style errors.
|
2022-02-25 10:36:02 +00:00 |
|
gdsoftdev
|
c4ed8cf25f
|
Merge branch 'Dolibarr:14.0' into 14.0
|
2022-02-25 11:28:46 +01:00 |
|
Jé GDSOFT
|
1040555baf
|
accoutancy : subleger label input automatic filling when selecting subleger account in select2 list
|
2022-02-25 11:26:56 +01:00 |
|