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

94962 Commits

This Branch
This Branch
All Branches
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
Laurent Destailleur
023dfab171
Merge pull request #20357 from FHenry/13_fix_incoterm 
fix:incoterm bad sql request
 2022-03-15 18:57:23 +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
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
10bfb76ae9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-03-10 15:54:39 +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
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
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
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
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
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
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
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
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
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
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
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