Commit Graph

90935 Commits

Author SHA1 Message Date
Laurent Destailleur
c8936f9919
Merge pull request #15094 from marc-dll/FIX_10.0_virtual_product_buying_price
FIX: virtual products: supplier discount was not applied in component list
2020-10-22 16:34:57 +02:00
Laurent Destailleur
3369379ba1
Update card.php 2020-10-22 16:34:23 +02:00
Philippe GRAND
1ca6068a41 fix : deprecated 2020-10-22 16:34:12 +02:00
Philippe GRAND
fae572d43a fix : deprecated 2020-10-22 16:29:17 +02:00
Laurent Destailleur
ec2a91471e
Merge pull request #15096 from dvasseur/patch-1
NEW Allow to edit "demand reason" field though API
2020-10-22 16:19:11 +02:00
Marc de Lima Lucio
34dd486b6c FIX: virtual products: displayed value is by unit 2020-10-22 16:18:37 +02:00
Laurent Destailleur
0f435f9901
Merge pull request #15098 from atm-gauthier/9.0_fix_worklow_order_auto_validated_with_shipping_validate_must_no_consider_services
FIX : WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING must not consider serv…
2020-10-22 16:18:11 +02:00
Laurent Destailleur
a9117fe864
Update interface_20_modWorkflow_WorkflowManager.class.php 2020-10-22 16:18:00 +02:00
Laurent Destailleur
fec8e5a0b8
Merge pull request #15022 from bafbes/abb120350
new:handle new type reference in add and update actions
2020-10-22 16:16:52 +02:00
Laurent Destailleur
81bfbbac26
Update actions_addupdatedelete.inc.php 2020-10-22 16:16:37 +02:00
Laurent Destailleur
0c3f8d2daa
Update actions_addupdatedelete.inc.php 2020-10-22 16:16:14 +02:00
stickler-ci
b5c2c6b755 Fixing style errors. 2020-10-22 14:15:16 +00:00
Laurent Destailleur
b88a9fc94d
Update actions_addupdatedelete.inc.php 2020-10-22 16:15:11 +02:00
Laurent Destailleur
2702bd023f
Merge pull request #15059 from frederic34/patch-6
Add ref instead id in bank check remittance
2020-10-22 16:12:31 +02:00
Josep Lluís
31ae2f2a21
NEW form to add customer/supplier into categories
Form to add customers and suppliers into categories, as in products
2020-10-22 16:12:01 +02:00
Laurent Destailleur
c09e71962e
Merge pull request #15060 from grandoc/new_branch_19_10_2020
fix : Warning: A non-numeric value encountered in /home/httpd/vhosts/…
2020-10-22 16:11:47 +02:00
Laurent Destailleur
9c9d468a18
Merge pull request #15052 from andreubisquerra/master
TakePOS connector compatibility with templates
2020-10-22 16:11:16 +02:00
Marc de Lima Lucio
1795ec6a9d FIX: supplier invoice: autoatically calculate payment term when modifying payment condition 2020-10-22 16:11:12 +02:00
Laurent Destailleur
8ce929d509
Merge pull request #15069 from ATM-Consulting/fix/9.0_linked_object_on_supplier_proposal_events
FIX 9.0 - when users create an event from a supplier proposal, the "linked objects" section says "Deleted"
2020-10-22 16:10:49 +02:00
Got2be
c2ad40043f FIX : WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING must not consider services while STOCK_SUPPORTS_SERVICES is empty 2020-10-22 16:10:47 +02:00
Laurent Destailleur
db06dc54a5
Merge pull request #15061 from hregis/develop_bug2
FIX wrong object name
2020-10-22 16:10:15 +02:00
Laurent Destailleur
648efbc0cb
Merge pull request #15067 from prietojc/12.0
FIX: Payment by BankTransfer
2020-10-22 15:59:19 +02:00
Laurent Destailleur
ca93f732c8
Update line.php 2020-10-22 15:59:04 +02:00
Laurent Destailleur
b9e6b188bc
Update rejetprelevement.class.php 2020-10-22 15:58:24 +02:00
Laurent Destailleur
10a8ce82a9
Update bonprelevement.class.php 2020-10-22 15:57:25 +02:00
Laurent Destailleur
315f125f28
Merge pull request #15068 from OPEN-DSI/calculate_virtual_stock_transverse_mode
NEW : Calculate the virtual stock in transverse mode
2020-10-22 15:56:03 +02:00
David
12a599d1c7
Allow "demand reason" field update though API 2020-10-22 15:53:55 +02:00
Laurent Destailleur
763d0baa14
Merge pull request #15066 from louiscarrese/develop
CLOSE #15065 Put the product label in bold in the PDF templates if co…
2020-10-22 15:53:43 +02:00
Laurent Destailleur
272caceab9
Merge pull request #15071 from joseplluis/patch-8
Add customer country information in popup
2020-10-22 15:53:12 +02:00
Laurent Destailleur
5a52534675
Merge pull request #15072 from FHenry/12.0_fix_14649
FIX #14649
2020-10-22 15:51:31 +02:00
Laurent Destailleur
37749e8e9c
Merge pull request #15075 from FHenry/12.0_fix_status_receipt_tot
fix set status on order Receipt when no dispatch
2020-10-22 15:50:30 +02:00
Laurent Destailleur
88df2ef36d
Merge pull request #15076 from FHenry/12.0_fix_margin_token
fix form token missing
2020-10-22 15:49:56 +02:00
Laurent Destailleur
a83131276d
Merge pull request #15079 from FHenry/dev_addtranslationkeyPDFInvoiceSituation
new: add PDFInvoiceSituation translation key for PDF title
2020-10-22 15:49:25 +02:00
Laurent Destailleur
1a70c016c5
Merge pull request #15093 from OPEN-DSI/new-invoice-list-margin-info-rights
Add rights on margin info on invoice list
2020-10-22 15:49:05 +02:00
Laurent Destailleur
bf6ec35478
Merge pull request #15095 from joseplluis/patch-9
FIX input name in MRP mask const
2020-10-22 15:45:36 +02:00
Laurent Destailleur
b96a59b089
Merge pull request #15086 from ppenelon/develop
NEW Retrieve discount from invoice from API
2020-10-22 15:45:09 +02:00
Laurent Destailleur
d7b7e1e386
Merge pull request #15083 from frederic34/printing_module
can add a driver for printing in module
2020-10-22 15:43:55 +02:00
Laurent Destailleur
9775728b7d
Merge pull request #15091 from ATM-Consulting/fix/12.0_object_thirdparty_not_always_fetched_on_presend_action_from_order
FIX 12.0 - third party of object is not always fetched when initiating an e-mail presend form
2020-10-22 15:43:31 +02:00
Josep Lluís
1221cc854d
FIX input name in MRP mask const
input name in MRP mask const was wrong
2020-10-22 15:23:45 +02:00
Marc de Lima Lucio
a232a19e7d FIX: virtual products: supplier discount was not applied in component list 2020-10-22 15:16:33 +02:00
Laurent Destailleur
732f236c32
Merge pull request #15084 from FHenry/12.0_fix_tokenCheck_GetSupplierPrice
12.0 fix token check get supplier price
2020-10-22 15:13:40 +02:00
Laurent Destailleur
d521ad6db4
Update objectline_edit.tpl.php 2020-10-22 15:11:54 +02:00
Laurent Destailleur
46a31f443d
Update objectline_create.tpl.php 2020-10-22 15:11:01 +02:00
Florian Mortgat
56db7d6c64 FIX: also check if there is a method $object->fetch_thirdparty() before calling it 2020-10-22 15:09:48 +02:00
Laurent Destailleur
a5d52baa05
Merge pull request #15089 from frederic34/patch-7
fill incoterms with company parameters
2020-10-22 15:09:47 +02:00
Laurent Destailleur
b45c99faec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-22 15:03:34 +02:00
Laurent Destailleur
92c6152ad5 FIX #14995 2020-10-22 15:03:12 +02:00
lvessiller
b13ef34804 NEW add rights on margin info on invoice list 2020-10-22 14:56:53 +02:00
Frédéric FRANCE
7d8df07253
Update card.php 2020-10-22 11:46:12 +02:00
Pierre Penelon
1d218b3260
Linting api_invoices.class.php 2020-10-22 09:56:13 +02:00