Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts: htdocs/langs/en_US/cashdesk.lang
This commit is contained in:
commit
ab54d30b57
@ -100,7 +100,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
|
||||
TakeposGroupSameProduct=Group same products lines
|
||||
StartAParallelSale=Start a new parallel sale
|
||||
SaleStartedAt=Sale started at %s
|
||||
ControlCashOpening=Control cash desk at opening POS
|
||||
ControlCashOpening=Control cash popup at opening POS
|
||||
CloseCashFence=Close cash desk control
|
||||
CashReport=Cash report
|
||||
MainPrinterToUse=Main printer to use
|
||||
|
||||
Loading…
Reference in New Issue
Block a user