Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-15 22:11:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Upstream/develop' into develop-loan

Browse Source 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
This commit is contained in:
aspangaro
2015-03-05 20:24:53 +01:00
parent c119ce382e d7ab3f112c
commit 11704e0807
145 changed files with 13361 additions and 1537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/langs/en_US/admin.lang
View File

@@ -1177,6 +1177,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### AskPriceSupplier #####
AskPriceSupplierSetup=Price requests suppliers module setup
AskPriceSupplierNumberingModules=Price requests suppliers numbering models
AskPriceSupplierPDFModules=Price requests suppliers documents models
FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models