lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
95,041 Commits 43 Branches 150 Tags 886 MiB
13.0
Commit Graph

83600 Commits

Author SHA1 Message Date
Laurent Destailleur
f13e7bb03d
Merge pull request #20341 from daraelmin/patch-8 
Fix Warning in htdocs/adherents/card.php
 2022-03-15 19:36:54 +01:00
Laurent Destailleur
d2d86ce53b
Merge pull request #20353 from Hystepik/develop_v13#1 
Fix #20351 : top navbar no longer hiden in extarnal site
 2022-03-15 19:23:24 +01:00
Laurent Destailleur
0899caf74d
Update lib_head.js.php 2022-03-15 19:23:17 +01:00
Florian HENRY
92bfd6893d fix:incoterm bad sql request 2022-03-15 09:10:41 +01:00
lmarcouiller
22706b70e9 fix syntax error 2022-03-14 16:21:12 +01:00
lmarcouiller
1a20afe29b Fix #20351 : top navbar no longer hiden in extarnal site 2022-03-14 16:11:34 +01:00
stickler-ci
19be5f662d Fixing style errors. 2022-03-14 08:25:15 +00:00
daraelmin
3eebbc0b14
Fix #20263 Accountancy setup displayed with right 
Fix #20263 Accountancy setup is displayed only for user with rights->accounting->chartofaccount
 2022-03-14 09:24:26 +01:00
daraelmin
45df52343b
Fix Warning in htdocs/adherents/card.php 
Fix Warning: Creating default object from empty value in htdocs/adherents/card.php on line 1058
 2022-03-13 14:42:38 +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
cc57d3dbc1 Fix phpcs 2022-03-09 22:25:29 +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
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
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
e13038dc30
Update product.class.php 2022-03-07 14:06:54 +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
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
df9fa39d34 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-02-28 22:22:10 +01:00
Marc de Lima Lucio
0e0dd1ec6c FIX: invoice pdf: lines originating from deposits were not detailed anymore 2022-02-22 17:42:11 +01:00
Marc de Lima Lucio
1574254dcf FIX: viewimage.php: bad call to dol_check_secure_access_document() caused images to be blocked with multicompany from entities > 1 2022-02-22 17:13:26 +01:00
Laurent Destailleur
959aa0ce59 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-02-18 21:44:34 +01:00
Laurent Destailleur
1c129fd3ea
Merge pull request #20038 from atm-quentin/FIX_12_sort_ht_amount 
FIX sort amount ht on cabyprodserv.php
 2022-02-18 21:04:52 +01:00
Laurent Destailleur
80f1cd8857 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-02-17 20:43:51 +01:00
Laurent Destailleur
edc984c6e3 # WARNING: head commit changed in the meantime 
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
 2022-02-17 20:43:22 +01:00
Laurent Destailleur
64ddead1b5
Merge pull request #20051 from ptibogxiv/patch-3 
FIX API REST for setup values
 2022-02-17 20:05:17 +01:00
Laurent Destailleur
2e744a4517
Update create_ticket.php 2022-02-17 19:18:22 +01:00
Thomas Negre
1c8c98ac0f fix ticket public interface: 
When sending an email to the customer,
If a custom URL had been provided for ticket public interface,
the link provided in the email did lead to the index of the public interface.
We want it to lead to /view.php
 2022-02-17 09:53:36 +01:00
Laurent Destailleur
eb8caf7419 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-02-16 21:17:19 +01:00
Laurent Destailleur
c16e013b99 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
 2022-02-16 21:13:49 +01:00
Laurent Destailleur
ed10db668d
Merge pull request #20073 from atm-quentin/FIX_13_combinations 
FIX weight is lost if it's comma on combinations card
 2022-02-16 20:34:24 +01:00
Laurent Destailleur
7029bb7000
Merge pull request #20077 from AlexisLaurier/bugfix/paymentByBankTransfertIndexTabEntity 
add missing entity check on list of withdraws on index of paymentbyba…
 2022-02-16 20:26:39 +01:00
Laurent Destailleur
a33ca21151
Merge pull request #20079 from AlexisLaurier/bugfix/fixPrelevmentLineDetails-ForBankPaymentTransfert 
manage details of prelevment line for bank transfer
 2022-02-16 20:22:54 +01:00
Alexis LAURIER
ff8dcdc4b7 manage details of prelevment line for bank transfer 2022-02-16 10:52:20 +01:00
Alexis LAURIER
8b0280a9d2 add missing entity check on list of withdraws on index of paymentbybanktransfert 2022-02-16 10:26:44 +01:00
Quentin VIAL-GOUTEYRON
82b3d89923 FIX wieght is loose if it's comma on combinations 2022-02-15 11:31:09 +01:00
atm-greg
96c7a9f77c fix pdf_cornas 2022-02-14 15:16:36 +01:00
atm-greg
3ebdb89133 fix pdf_mucadet 2022-02-14 15:11:26 +01:00
ptibogxiv
8d3e97bab9
Update api_setup.class.php 2022-02-12 19:21:07 +01:00
ptibogxiv
11e15255bd
FIX API REST for setup values 2022-02-12 16:59:29 +01:00
Quentin VIAL-GOUTEYRON
d819d427c3 FIX sort amount ht 2022-02-10 16:46:19 +01:00
Laurent Destailleur
7a1c4172a6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-02-10 11:20:09 +01:00
Laurent Destailleur
793e43c7c6
Update fournisseur.commande.class.php 2022-02-10 09:29:11 +01:00
noec764
d9bac75a63
Merge branch '12.0' into 12.0_Fix_Double_CommandeFournisseurDet 2022-02-09 15:33:45 +01:00
Noé Courtier
e4c1978e12 Change of SQL request when fetching CommandeFournisseurLigne 2022-02-09 12:24:33 +01:00
Laurent Destailleur
3f87db08d4
Update product.class.php 2022-02-04 12:55:31 +01:00
El-dge
d09303d27c
Issue on stock virtuel : fix Dolibarr/dolibarr#18634 2022-02-04 12:31:40 +01:00
Laurent Destailleur
07ef603c2c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-01-23 16:12:37 +01:00
Laurent Destailleur
251609eb26 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-01-23 16:12:27 +01:00
Maxime Kohlhaas
ea55712d1b Fix missing require class project 2022-01-15 23:04:56 +01:00
lvessiller
a9c76f2e44 FIX replace print error with event message when error on update line in supplier order 2022-01-14 16:09:30 +01:00
Laurent Destailleur
9dde80dd52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expedition/card.php
	htdocs/fourn/commande/list.php
 2022-01-14 10:30:39 +01:00
Laurent Destailleur
5b6133ad62
Merge pull request #19821 from marc-dll/12.0_FIX_shipment_all_lines 
FIX: order to shipment: debug hidden conf SHIPMENT_GETS_ALL_ORDER_PRODUCTS
 2022-01-14 10:19:28 +01:00
lvessiller
cacff0c2d4 FIX cast int for search user 2022-01-13 16:18:57 +01:00
lvessiller
22f6d204a2 FIX search by user in supplier order list 2022-01-13 16:01:23 +01:00
Marc de Lima Lucio
b110ca6ead FIX: order to shipment: FIX hidden conf SHIPMENT_GETS_ALL_ORDER_PRODUCTS (still not working when not preselecting a warehouse) 2022-01-12 16:40:43 +01:00
lvessiller
400f6b244b FIX user actions rights when mulit-company transverse mode is enabled 2022-01-11 17:29:02 +01:00
Laurent Destailleur
cde290c78a
Merge pull request #19402 from atm-gauthier/fix_reorder_lines_after_delete_line_everywhere 
FIX : reorder all lines when delete document line everywhere (4 documents were missing)
 2022-01-10 21:23:23 +01:00
Laurent Destailleur
ff31d660c6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-01-07 15:50:40 +01:00
Laurent Destailleur
451fa396aa Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2022-01-07 15:50:30 +01:00
Laurent Destailleur
b23b82bd6f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2022-01-07 15:49:09 +01:00
Laurent Destailleur
7dfb369a98 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2022-01-07 15:48:23 +01:00
Laurent Destailleur
265aeb76e6 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/utils.class.php
	htdocs/expensereport/class/expensereport.class.php
 2022-01-07 15:48:13 +01:00
Laurent Destailleur
5ee74d7c07 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2022-01-07 15:45:51 +01:00
Laurent Destailleur
1541e20870 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/utils.class.php
 2022-01-07 15:43:28 +01:00
Laurent Destailleur
53709cf509 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/utils.class.php
 2022-01-07 15:40:05 +01:00
Laurent Destailleur
10e32c056e FIX avoid infinite loop on dump with popen 2022-01-07 15:35:33 +01:00
Laurent Destailleur
f2beaf5eae
Merge pull request #19729 from fmarcet/13.0 
Fix: correctly display the products of a warehouse in the pdf
 2022-01-07 10:45:10 +01:00
Laurent Destailleur
37daf7764d
Merge pull request #19753 from atm-lena/13.0_FIX_ActionCommList_LateWarning 
FIX : late warning calculation on action comm list
 2022-01-06 12:55:37 +01:00
stickler-ci
ec11be2480 Fixing style errors. 2022-01-06 10:31:50 +00:00
atm-lena
97d9b4571a FIX : late warning calculation on action comm list 2022-01-06 11:21:46 +01:00
Laurent Destailleur
518b163066 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/stock/movement_list.php
 2022-01-06 11:01:27 +01:00
daraelmin
1f6e9a1a9e
Fix install - Belgium provinces incorrect mapping 2022-01-04 18:46:29 +01:00
Laurent Destailleur
b600fe7377 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-01-04 09:38:33 +01:00
Laurent Destailleur
ba6033da8e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/modulebuilder/template/admin/setup.php
 2022-01-04 09:38:11 +01:00
Ferran Marcet
26c6908f66 Fix: Correctly display product translations 2022-01-03 13:22:07 +01:00
Ferran Marcet
08685cc6b0 Fix: Correctly display product translations 2022-01-03 13:14:40 +01:00
Ferran Marcet
ff2388ceaf Fix: correctly display the products of a warehouse in the pdf 2022-01-03 13:08:20 +01:00
Laurent Destailleur
9f82aa1570 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/modulebuilder/template/admin/setup.php
 2021-12-30 17:51:25 +01:00
Laurent Destailleur
7bdfc998bf Fix regression 2021-12-30 17:49:53 +01:00
Laurent Destailleur
76a0caf116
Merge pull request #19717 from OPEN-DSI/fix-company-list-title-on-nature-of 
FIX title for nature of third party in company list
 2021-12-30 17:25:08 +01:00
lvessiller
f16166c47c FIX title for nature of third party in company list 2021-12-30 15:35:49 +01:00
Maxime Kohlhaas
d82c1f34e0 Fix modulebuilder params for updatemask action 2021-12-25 11:33:26 +01:00
Laurent Destailleur
0a72aed3d7 Fix missing space before union 2021-12-23 13:35:38 +01:00
Laurent Destailleur
9feb3a0adb
Merge pull request #19492 from fmarcet/13.0 
Fix: Import don't work if extrafield is separator
 2021-12-22 00:25:03 +01:00
Laurent Destailleur
e76c85bc8d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-12-21 16:32:45 +01:00
Laurent Destailleur
856b010a45 FIX #19651 2021-12-21 15:56:59 +01:00
Ferran Marcet
2b7c3be511 Replace sql operator 2021-12-20 12:34:46 +01:00
Ferran Marcet
aa3f473ebc Merge branch '13.0up' into 13.0 2021-12-20 12:32:43 +01:00
Laurent Destailleur
baa9585f85 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/holiday/month_report.php
 2021-12-19 00:01:11 +01:00
Laurent Destailleur
1cc0f8e15f
Merge pull request #18167 from ATM-Consulting/FIX_13.0_extrafields_inoperative_in_receptions 
FIX: line extrafields are inoperative in dispatch cards even when they exist
 2021-12-16 18:54:38 +01:00