lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
88,658 Commits 43 Branches 150 Tags 886 MiB
6f83c8c6f3
Commit Graph

88658 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
6f83c8c6f3
Update productbatch.class.php 2022-05-24 21:22:14 +02:00
atm-greg
8213756c37 fix sql to avoid getting product_stock of another product with same batch 2022-05-24 16:49:55 +02:00
Laurent Destailleur
a254412c61 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/debugbar/class/DataCollector/DolLogsCollector.php
 2022-05-03 11:54:28 +02:00
Laurent Destailleur
cc1a3080d0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2022-05-03 11:53:23 +02:00
Laurent Destailleur
b5f887b3e4 Fix DEBUGBAR_USE_LOG_FILE 2022-05-03 11:52:32 +02:00
Laurent Destailleur
694357d48e
Merge pull request #19420 from marc-dll/12.0_FIX_project_activity_default_workingdays 
FIX: project timesheets: assume Saturday and Sunday as default weekend days when working days conf is empty or badly formed
 2022-04-14 23:23:12 +02:00
Laurent Destailleur
c4f80b4e71
Merge pull request #19424 from marc-dll/12.0_FIX_employee_tab_holiday_length 
FIX: user employee tab: offset in open days messes up holiday length calculation
 2022-04-14 22:59:20 +02:00
Laurent Destailleur
ece9f3037a
Merge pull request #19788 from OPEN-DSI/v12-fix-user-card-modify-transverse-rights 
FIX user actions rights when multi-company transverse mode is enabled
 2022-04-02 18:15:50 +02:00
Laurent Destailleur
8dd44246b0
Merge pull request #20348 from daraelmin/daraelmin-patch-5 
Fix #20263 Accountancy setup displayed with right
 2022-03-29 14:47:57 +02:00
Laurent Destailleur
76470c9548
Merge pull request #20297 from aspangaro/12p23 
FIX #20279 Accountancy - PostGreSQL - Error on mass update lines already binded
 2022-03-24 20:30:01 +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
Laurent Destailleur
d27c0b31fc Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2022-03-10 15:54:08 +01:00
Laurent Destailleur
a1534955a1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2022-03-10 15:52:50 +01:00
Laurent Destailleur
79371f66b0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2022-03-10 15:52:28 +01:00
Laurent Destailleur
4569cb82b2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2022-03-10 15:52:04 +01:00
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
cc57d3dbc1 Fix phpcs 2022-03-09 22:25:29 +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
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
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
Eric Seigne
744b84cb09 fix #20270 : use product_id in sql only if product_id is defined 2022-03-04 15:20:50 +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
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
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
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
97575854d0
Merge pull request #20094 from thomas-Ngr/12_fix_ticket_public_email_wrong_custom_url 
fix ticket: wrong link sent to customer
 2022-02-17 19:18:36 +01:00
Laurent Destailleur
2e744a4517
Update create_ticket.php 2022-02-17 19:18:22 +01:00
Thomas Negre
1ad8700810 empty commit to force travis try rebuild 2022-02-17 11:08:23 +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
92cb95a184
Merge pull request #20064 from ATM-Consulting/FIX_uniformize_pdf_logo_behaviour 
Fix uniformize pdf logo behaviour for supplier orders
 2022-02-16 21:09:45 +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
Quentin VIAL-GOUTEYRON
d819d427c3 FIX sort amount ht 2022-02-10 16:46:19 +01:00
Laurent Destailleur
db81b32a5d
Merge pull request #20028 from noec764/12.0_Fix_Double_CommandeFournisseurDet 
Change of SQL request when fetching CommandeFournisseurLigne
 2022-02-10 09:30:36 +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
a0154503f4
Merge pull request #19838 from OPEN-DSI/v12-fix-supplier-order-print-error 
FIX replace print error with event message when error on update line …
 2022-01-23 13:37:09 +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
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
Laurent Destailleur
90c3c90864
Merge pull request #19829 from OPEN-DSI/v12-fix-supplier-order-list-search-user 
FIX search by user in supplier order list
 2022-01-14 09:45:06 +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