Commit Graph

112767 Commits

Author SHA1 Message Date
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
eff4a894c2
Merge pull request #20242 from JohnXLivingston/fix_status_batch_doc
Fix: update status_batch documentation
2022-03-07 14:55:34 +01:00
Laurent Destailleur
6bb49797f8
Merge pull request #20243 from JohnXLivingston/fix_template_name_typo
Fix: typo in template name
2022-03-07 14:55:02 +01:00
Laurent Destailleur
bda5b775de
Merge pull request #20253 from thomas-Ngr/develop_fix_ticket_messages_order_by_date
fix: make ticket messages order by date desc by default
2022-03-07 14:33:04 +01:00
Laurent Destailleur
ee338e442c
Merge pull request #20246 from dolibit-ut/patch-374
Update README.md
2022-03-07 14:32:13 +01:00
Laurent Destailleur
8eaf7a9d8a
Merge pull request #20251 from atm-kevin/FIX_ADD_Init_Hooks_On_Project_Tabs
FIX : Add hooks on several project tabs
2022-03-07 14:31:37 +01:00
Laurent Destailleur
feafbaded2
Update info.php 2022-03-07 14:31:19 +01:00
Laurent Destailleur
2ef42c178b
Update info.php 2022-03-07 14:30:38 +01:00
Laurent Destailleur
acb47a4cc7
Update document.php 2022-03-07 14:29:39 +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
6a979dacd6
Merge pull request #20261 from aspangaro/16a3
NEW Dictionaries - add possibility to manage countries in EEC
2022-03-07 14:24:31 +01:00
Laurent Destailleur
7d374dc4f6
Merge pull request #20264 from fmarcet/15.0
Fix: #20161 Can't import thirds. Column Skype doesn't exist
2022-03-07 14:21:42 +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
c4f40fa089
Merge pull request #20276 from frederic34/patch-1
Fix wrong upload dir
2022-03-07 13:45:01 +01:00
Laurent Destailleur
403db246bb
Merge pull request #20280 from Achicken7301/develop
Add unit price for {DOL_PRINT_OBJECT_LINES}
2022-03-07 13:44:03 +01:00
Laurent Destailleur
edaf740e78
Update dolreceiptprinter.class.php 2022-03-07 13:43:16 +01:00
Laurent Destailleur
52aed53480 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-07 13:24:16 +01:00
Laurent Destailleur
2142440b6c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/index.php
	htdocs/langs/en_US/errors.lang
2022-03-07 13:23:47 +01:00
Laurent Destailleur
621abfd70d Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-07 13:21:56 +01:00
Laurent Destailleur
378dab69a6 FIX #19777 #20281 2022-03-07 13:21:32 +01:00
Laurent Destailleur
d2c95c9a1a
Merge pull request #20284 from frederic34/patch-5
clean comment
2022-03-07 12:32:49 +01:00
Laurent Destailleur
2e045db155
Merge pull request #20286 from andreubisquerra/develop
Set to default place after close sale in TakePOS
2022-03-07 12:32:34 +01:00
Laurent Destailleur
f4cb5810a7 FIX list of visible type of event was not correctly filtered
FIX Error management on mass action "Approve holiday"
2022-03-07 12:01:34 +01:00
Quentin VIAL-GOUTEYRON
cc591b3a03 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_inventory_pmp_hidden_conf 2022-03-07 10:12:17 +01:00
Laurent Destailleur
e6857c9f64 Fix color in css 2022-03-06 20:31:06 +01:00
andreubisquerra
3715659880
Set to default place after close sale in TakePOS
Set to default place after close sale in TakePOS when Bar Restaurant mode is enabled
2022-03-06 12:27:59 +01:00
Frédéric FRANCE
543c475a71
clean comment 2022-03-06 10:56:17 +01:00
Khang
9cada04261 Add unit price for "free-text product" receipt 2022-03-05 16:58:37 +07:00
Khang
d326fe02cf Feature: unit price for {DOL_PRINT_OBJECT_LINES}
Module "Receipt printers":
add unit price for {DOL_PRINT_OBJECT_LINES} in tabs "template setup"
2022-03-05 07:02:36 +07:00
Laurent Destailleur
893e1571b8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-04 22:43:35 +01:00
Laurent Destailleur
c45d6a3bc7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-04 19:45:02 +01:00
Laurent Destailleur
792dcc6334 FIX creation of the shipment if order contains services - 2/2 2022-03-04 19:14:57 +01:00
Frédéric FRANCE
9d1bcbe55a
Fix wrong upload dir
introduced here https://github.com/Dolibarr/dolibarr/pull/19165
2022-03-04 18:17:23 +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
steve
665e401564 wip: replace butAction 2022-03-04 17:03:40 +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
Laurent Destailleur
82e2f8706a Doc 2022-03-04 11:22:34 +01:00
Ferran Marcet
8c2c3bf3fb Fix: Can't import thirds. Column Skype doesn't exist 2022-03-04 10:06:24 +01:00
Ferran Marcet
da772676de Merge branch '15.0up' into 15.0 2022-03-04 09:58:30 +01:00
Alexandre SPANGARO
1671b095eb Fix also table llx_c_country 2022-03-04 07:02:40 +01:00
Alexandre SPANGARO
13b69bcf93 NEW Dictionaries - add possibility to manage countries in EEC 2022-03-04 07:00:02 +01:00
steve
436b8fa5b5 apply feedbacks 2022-03-03 16:18:09 +01:00