lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Dolibarr:17.0' into 17.0

Browse Source
This commit is contained in:
daraelmin 2023-04-07 08:00:33 +02:00 committed by GitHub
commit 48f14a66bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/debian/rules
View File

@ -19,6 +19,10 @@ override_dh_auto_clean:
override_dh_auto_build: override_dh_auto_build:
# Do nothing. Added to disable launchpad to use bugged dh_auto_build search for ant # Do nothing. Added to disable launchpad to use bugged dh_auto_build search for ant
# Force the compression format for control files
override_dh_builddeb:
dh_builddeb -- -Zxz
#override_dh_compress: #override_dh_compress:
# dh_compress --no-act -X.png # dh_compress --no-act -X.png

4
build/debian/source/options
View File

@ -1,3 +1,5 @@
# Force use of gzip compression by dpkg-buildpackage # Force use of gzip compression by dpkg-buildpackage for the tarball *.debian.tar.gz
# See also option --compression from command line of dpkg-buildpackage
# Format for the control files are defined into the rules file in override_dh_builddeb section
compression = "gzip" compression = "gzip"
#compression-level = 9 #compression-level = 9

2
build/makepack-dolibarr.pl
View File

@ -1050,7 +1050,7 @@ if ($nboftargetok) {
print "Go into directory $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n"; print "Go into directory $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";
chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build");
#$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
$cmd="dpkg-buildpackage -us -uc"; $cmd="dpkg-buildpackage -us -uc --compression=gzip";
print "Launch DEB build ($cmd)\n"; print "Launch DEB build ($cmd)\n";
$ret=`$cmd 2>&1 3>&1`; $ret=`$cmd 2>&1 3>&1`;
print $ret."\n"; print $ret."\n";

3
htdocs/compta/facture/list.php
View File

@ -2547,6 +2547,9 @@ if ($resql) {
$i++; $i++;
} }
// Use correct digits number for totals
$totalarray['val']['total_margin'] = price2num($totalarray['val']['total_margin'], 'MT');
// Show total line // Show total line
include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php'; include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
} }

1
htdocs/langs/en_US/bills.lang
View File

@ -285,6 +285,7 @@ SetRevenuStamp=Set revenue stamp
Billed=Billed Billed=Billed
RecurringInvoices=Recurring invoices RecurringInvoices=Recurring invoices
RecurringInvoice=Recurring invoice RecurringInvoice=Recurring invoice
RecurringInvoiceSource=Recurring invoice ar source
RepeatableInvoice=Template invoice RepeatableInvoice=Template invoice
RepeatableInvoices=Template invoices RepeatableInvoices=Template invoices
RecurringInvoicesJob=Generation of recurring invoices (sales invoices) RecurringInvoicesJob=Generation of recurring invoices (sales invoices)

2
htdocs/product/inventory/list.php
View File

@ -704,7 +704,7 @@ if ($num == 0) {
$colspan++; $colspan++;
} }
} }
print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>'; print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
} }