Merge pull request #1 from Dolibarr/develop

merge from develop

.github/workflows/stale-issues.yml

@@ -9,15 +9,15 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-    - uses: Dolibarr/stale@v1.1.0
+    - uses: Dolibarr/stale@master
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue is stale because it has been open 1 year with no activity. If this is a bug, please comment to confirm it is still present on latest stable version. if this is a feature request, please comment to notify the request is still relevant and not yet covered by latest stable version. Without comment, this issue will be closed automatically by stale bot in 15 days.'
         stale-issue-label: 'Issue Stale (automatic label)'
         exempt-issue-label: 'Priority High / Blocking'
         days-before-stale: 365
         days-before-close: 15
-        operations-per-run: 10
+        operations-per-run: 50
         #stale-pr-message: 'This PR is stale because it has been open 1 year with no activity. If this PR is still mergeable (no conflict, nor Continuous Integration errors), please comment to confirm this merge is still expected. Without comment, this issue will be closed automatically by stale bot in 15 days.'
         stale-pr-label: 'PR Stale (automatic label)'
         stale-pr-message: 

build/README

@@ -45,9 +45,12 @@ Dolibarr working. It is here only to build Dolibarr packages, and those
 generated packages will not contains this "build" directory.
 
 
-We can find in "build", following sub-directories:
+You can find in "build", following sub-directories:
 
-* debian:
+* composer
+To test an upgrade of a lib.
+
+* debian
 To build Debian package.
 
 * dmg:

build/obs/README

@@ -1,20 +1,24 @@
 README (English)
 ##################################################
 OBS Package tools
+OBE - openSUSE Build Service 
 ##################################################
 
-This directory contains files to explain how to publish
-a package onto OBS
+This directory contains an instruction to explain 
+how to publish a package onto OBS.
 
 
-# Create a project onto OBS
-#----------------------------------
-https://build.opensuse.org
+# Create a project onto OBS 
+--------------------------- 
+https://build.opensuse.org 
 
-Packaging rules: http://en.opensuse.org/Portal:Packaging
+
+# Packaging rules: 
+------------------
+https://en.opensuse.org/Portal:Packaging
 
 Add attributes:
-OBS:Screenshots         URL of screenshot http://www.dolibarr.org/images/dolibarr_screenshot1.png
+OBS:Screenshots         URL of screenshot https://www.dolibarr.org/images/dolibarr_screenshot1.png
 OBS:QualityCategory     Development|Testing|Stable|Private
 OBS:Maintained          1
 
@@ -28,22 +32,24 @@ To submit a snapshot for building, we should have a service file with content
   </service>
 </services>
 
-How to have such a service file created automatically ?
 
-Go into project you want to update. It mught be:
+# How to have such a service file created automatically ?
+---------------------------------------------------------
+Go into project you want to update. It might be:
 - openSUSE Build Service > Projects > Application:ERP:Dolibarr > dolibarr
 - or your private project
 
 Once logged, click on "Add file" in section "Source Files", then select mode "Upload From: Remote URL"
 Keep empty for "Filename", choose "Remote URL" and enter into last field, URL that should looks like this:
-http://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-x.y.v-0.4.src.rpm
+https://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-x.y.v-0.4.src.rpm
 
 Then add into Advanded - Attributes
-OBS:Screenshots http://www.dolibarr.org/images/dolibarr_screenshot1.png
-OBS:QualityCategory Stable|Testing|Development|Private
+OBS:Screenshots       https://www.dolibarr.org/images/dolibarr_screenshot1.png
+OBS:QualityCategory   Stable|Testing|Development|Private
 
 
 # Move project into official directory
+--------------------------------------
 - Enter a bug to ask to be a maintener of a category or to add a new one.
 For example: https://bugzilla.novell.com/show_bug.cgi?id=848083 to be a maintener of category
 https://build.opensuse.org/project/show/Application:ERP

dev/translation/erp_comparison_translation.txt

@@ -1,17 +1,25 @@
+comparison of terms
 
 
-Term Dolibarr		SAP					Odoo							...
-----------------------------------------------------------------------------
-Thirdparty			Contact partner		Partner/Contact (company)
-Contact/address		Contact person		Partner/Contact (individual)
+Dolibarr             SAP ERP					      Odoo							    
+-------------------------------------------------------------------------
+Thirdparty			     Contact partner	    	Partner/Contact (company)
+Contact/address		   Contact person	  	    Partner/Contact (individual)
 
-Financial			??					Invoicing
+Financial 			     Finance (FI)				  	Accounting
+Accounting
 
-Income / Expense	??					Profit / Loss
-Balance				??					Net profit
-Subledger account	Subledger account	??
 
+Income / Expense	       ??					        Profit / Loss
+Balance				           ??					        Net profit
+Subledger account	   Subledger account	        ??
 
-Proposal            ??                  Quotation                       Proposal is ok but proposition looks better (proposal is for a detailed proposition). We can say also "business proposition or business proposal".
-                                                                        Indian are using "Quotation".
+CRM                  Sales & Distribution   Sales 
+Proposal                ??                  Quotation                         
+
+
+
+Proposal is ok but proposition looks better (proposal is for a detailed proposition). 
+We can say also "business proposition or business proposal".
+In India they are using "Quotation".
 

htdocs/accountancy/admin/account.php

@@ -283,13 +283,16 @@
 			<script type="text/javascript">
 			$(document).ready(function () {
 		    	$("#searchFormList").on("submit", function (e) {
+					//event.preventDefault();
+				    //var form = this;
 					console.log("chartofaccounts focus = "+$("#chartofaccounts").is(":focus"));
 					console.log("change_chart focus = "+$("#change_chart").is(":focus"));
 					if ($("#change_chart").is(":focus"))
 					{
 						console.log("We set valid_change_chart to 1");
 						$("#valid_change_chart").val(1);
 					}
+					//form.submit();
 					return true;
 			    });
 			});

htdocs/accountancy/admin/defaultaccounts.php

@@ -161,6 +161,7 @@
 // Define main accounts for thirdparty
 
 print '<table class="noborder centpercent">';
+print '<tr class="liste_titre"><td>'.$langs->trans("ThirdParties").' | '.$langs->trans("Users").'</td><td></td></tr>';
 
 foreach ($list_account_main as $key) {
     print '<tr class="oddeven value">';
@@ -180,15 +181,6 @@
 }
 
 
-print "</table>\n";
-
-
-print '<br>';
-
-// Define default accounts
-
-print '<table class="noborder centpercent">';
-
 foreach ($list_account as $key) {
 	$reg=array();
 	if (preg_match('/---(.*)---/', $key, $reg)) {

htdocs/accountancy/admin/export.php

@@ -134,13 +134,13 @@
 
 $form = new Form($db);
 
-$title = $langs->trans('ConfigAccountingExpert');
+$title = $langs->trans('ExportOptions');
 llxHeader('', $title);
 
 
 $linkback = '';
 // $linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1">' . $langs->trans("BackToModuleList") . '</a>';
-print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'accountancy');
+print load_fiche_titre($langs->trans('ExportOptions'), $linkback, 'accountancy');
 
 
 print "\n".'<script type="text/javascript" language="javascript">'."\n";