lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
83,194 Commits 43 Branches 150 Tags 886 MiB
caecb0152f
Commit Graph

7607 Commits

Author SHA1 Message Date
Laurent Destailleur
84c1228ad4 FIX Disable ticket status change if ticket close 
FIX Use ref into label of ticket message
 2020-02-07 12:15:15 +01:00
Laurent Destailleur
387db16217 FIX Filenames must not contains non ascii char or we will get non ascii 
char into the SMTP header.

Conflicts:
	htdocs/core/class/CMailFile.class.php
 2020-02-06 13:03:10 +01:00
Laurent Destailleur
e14612f569 FIX Filenames must not contains non ascii char or we will get non ascii 
char into the SMTP header.

Conflicts:
	htdocs/core/class/CMailFile.class.php
 2020-02-06 13:02:27 +01:00
Laurent Destailleur
13442ef0df FIX Filenames must not contains non ascii char or we will get non ascii 
char into the SMTP header.
 2020-02-06 13:01:09 +01:00
andreubisquerra
220f02805d Update image path after move image directory 
We need change path after move image in the commit:
de4183ea65 (diff-7af3f43d430a17d6e548d766fbacecc2)

Conflicts:
	htdocs/core/class/dolreceiptprinter.class.php
 2020-02-05 14:12:29 +01:00
Laurent Destailleur
d8ed62ea33 Fix line_max for BOM 2020-02-03 06:28:51 +01:00
Laurent Destailleur
e5808e3335 FIX #12995 2020-02-03 04:48:17 +01:00
Laurent Destailleur
7c35e9aaa8 FIX #12932 2020-02-03 03:56:30 +01:00
Laurent Destailleur
1dab308e4a FIX #12932 2020-02-03 03:55:37 +01:00
Laurent Destailleur
af61c19ffd Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-01-29 23:06:21 +01:00
Laurent Destailleur
60f772d285 FIX Pending amount to pay must be zero if invoice close for anticipated 
payment.
 2020-01-29 17:56:09 +01:00
Laurent Destailleur
1e13f6fd0f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/resource/class/dolresource.class.php
	htdocs/resource/list.php
 2020-01-29 11:44:04 +01:00
altairis
3c3876eb59 FIX : default lang selection when filter 2020-01-29 11:32:24 +01:00
VESSILLER
7cdd334995 FIX require category class in extrafield 2020-01-28 11:37:23 +01:00
Laurent Destailleur
09f809f347 FIX #12913 2020-01-25 14:03:24 +01:00
Laurent Destailleur
779cd94b0e Debug cashfence feature 2020-01-24 15:26:18 +01:00
Laurent Destailleur
540713510e Fix load of segment prices not required for virtual stock change 
virtual stock must include production (WIP)
 2020-01-23 21:03:15 +01:00
Laurent Destailleur
b3bbb23dae Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/smtps.class.php
 2020-01-23 17:38:14 +01:00
Laurent Destailleur
8030558117 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/smtps.class.php
 2020-01-23 17:34:40 +01:00
Laurent Destailleur
7ee37ddd3f FIX Error in log for email sending with smtps was not complete 2020-01-23 17:30:05 +01:00
Laurent Destailleur
4686be34d2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/stripe/charge.php
 2020-01-22 14:10:46 +01:00
Laurent Destailleur
443e4e2223
Update html.form.class.php 2020-01-22 13:44:42 +01:00
Laurent Destailleur
8f1737952d Fix search on accounting account when option to padd 0 is on. 2020-01-21 22:20:32 +01:00
Laurent Destailleur
a36b0ea4f5 Fix filter on parent account in list of accounting accounts 2020-01-21 21:36:40 +01:00
John Botella
d6766af35d Fix dom and missing param 2020-01-21 14:17:53 +01:00
Laurent Destailleur
d2cf4c55ee Fix label of status 2020-01-20 23:58:01 +01:00
Laurent Destailleur
cfc74db5bc FIX field 'private' on email templates was not managed. 2020-01-20 18:38:53 +01:00
Laurent Destailleur
18f2b09fb1 Debug v11 2020-01-20 12:25:25 +01:00
Laurent Destailleur
d9f7c4aec4 FIX #12838 2020-01-18 19:53:48 +01:00
Laurent Destailleur
d7423c23de Doc 2020-01-16 12:34:53 +01:00
Norbert Penel
3c2dd7db7c Fix modulbuilder create forms 
'fk_product' => array('type' => 'integer:Product:product/class/product.class.php' ...
the input was arriving with a select2 instead of an ajax search
 2020-01-15 20:11:34 +01:00
Laurent Destailleur
28d5901da4 Fix error of mysqldump not thrown in some cases 2020-01-15 16:45:13 +01:00
Laurent Destailleur
1d3d26e185 Fix phpcs 2020-01-15 12:26:11 +01:00
Laurent Destailleur
2465d5ab47
Merge pull request #12837 from laudeco/hotfix/replenish_product 
replenish product
 2020-01-13 13:18:28 +01:00
Laurent Destailleur
9c9b73e4d1 Fix translation of \n and \\s into language files. 2020-01-13 13:11:25 +01:00
Laurent Destailleur
ce17f65b08
Merge pull request #12829 from atm-florian/11.0 
Fix Warning
 2020-01-13 11:39:05 +01:00
Laurent De Coninck
66e08103de
change the PHPdoc 2020-01-13 10:43:39 +01:00
Laurent Destailleur
d97a59ac4a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	ChangeLog
	htdocs/comm/remise.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
	htdocs/variants/combinations.php
 2020-01-10 14:25:26 +01:00
Laurent Destailleur
c4d62e0ea3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/list.php
 2020-01-10 13:51:29 +01:00
Laurent Destailleur
f48c7d2ecf Fix modulebuilder 2020-01-09 22:31:23 +01:00
florian HENRY
83ada939d5 fix warning 2020-01-09 16:26:30 +01:00
Dev2a
57c954f2e8 Fix Check array of action after kooks 2020-01-07 21:41:36 +01:00
Laurent Destailleur
ec81474694 Fix form confirm for "one column" type. 2020-01-07 20:36:36 +01:00
Laurent Destailleur
c02a27ba77 Fix log 2020-01-06 13:25:14 +01:00
Laurent Destailleur
9df85a26b8 Fix var_dump 2020-01-06 03:50:42 +01:00
Laurent Destailleur
38de69f5a9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/list.php
	htdocs/compta/bank/releve.php
	htdocs/compta/salaries/card.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/boxes.lang
	htdocs/langs/en_US/main.lang
	htdocs/product/class/product.class.php
	htdocs/product/reassort.php
	htdocs/product/stock/product.php
	htdocs/projet/element.php
 2020-01-04 14:20:25 +01:00
Laurent Destailleur
ce7360ced3 Code comment 2020-01-01 18:43:46 +01:00
Laurent Destailleur
bf9f9df50f Fix var not defined 2020-01-01 13:46:09 +01:00
Laurent Destailleur
d175b34323 Fix log 2020-01-01 13:22:20 +01:00
Laurent Destailleur
821ff375b0 Fix update ref 2020-01-01 13:15:42 +01:00
Laurent Destailleur
4c6c8e172f
Merge pull request #12784 from Dolibarr/revert-12751-v10-fix-html-form-margin-class 
Revert "FIX class Facture undefined in displaying margin information"
 2019-12-31 17:33:21 +01:00
Laurent Destailleur
08d0d63a04 FIX #12760 #12763 #12755 #12765 #12751 2019-12-31 17:30:27 +01:00
Laurent Destailleur
5cc0d26eae
Revert "FIX class Facture undefined in displaying margin information" 2019-12-31 17:26:02 +01:00
Laurent Destailleur
6e90e81be1
Merge pull request #12751 from OPEN-DSI/v10-fix-html-form-margin-class 
FIX class Facture undefined in displaying margin information
 2019-12-30 22:00:28 +01:00
Marc de Lima Lucio
c8dfc3d9fc FIX: error 500 when getting margin info for objects other than invoices 2019-12-24 16:09:29 +01:00
VESSILLER
720146c45f FIX class Facture undefined in displaying margin information 2019-12-23 15:37:12 +01:00
Laurent Destailleur
29cacec886 Fix month when using "Now" button addnowlink = 2 2019-12-23 14:39:24 +01:00
Laurent Destailleur
9a08a6bf6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/categories/traduction.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contact/card.php
	htdocs/core/modules/modSociete.class.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/langs/en_US/products.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php
 2019-12-23 14:13:26 +01:00
Laurent Destailleur
93cece6a3a
Merge pull request #12738 from mapiolca/patch-16 
#FIX Error Margin with Situation Invoice
 2019-12-23 13:43:18 +01:00
Laurent Destailleur
a92db7db39 Look and feel v11 2019-12-23 13:02:30 +01:00
Laurent Destailleur
2df9df2db0 Debug v11 2019-12-23 12:24:27 +01:00
Laurent Destailleur
d4138876af Fix alignement in validation popup 2019-12-23 11:16:40 +01:00
Regis Houssin
8321fe6ad2 FIX missing nl2br conversion 2019-12-22 09:13:34 +01:00
Laurent Destailleur
58771c7d8a Debug MRP v11 2019-12-20 17:39:42 +01:00
Pierre Ardoin
538921f479
#FIX Error Margin with Situation Invoice 
Fix an issue that show a negative margin when $line->situation_percent is not 100%

Now, the margin price take progress into account.
 2019-12-19 10:35:38 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-18 14:20:36 +00:00
Laurent Destailleur
3ae87924f1 Fix no user $global $conf into $conf object. 2019-12-18 14:32:23 +01:00
Scrutinizer Auto-Fixer
404ae0c209 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-17 02:00:52 +00:00
Laurent Destailleur
d22cd5c321 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/accountancy/bookkeeping/list.php
 2019-12-16 19:09:53 +01:00
Laurent Destailleur
65abe7532c Fix error message not reported when deleting record in ledger. 2019-12-16 19:05:32 +01:00
Laurent Destailleur
1af67a4336
Merge pull request #12713 from frederic34/doxygen_warning 
doxygen
 2019-12-16 19:02:10 +01:00
Scrutinizer Auto-Fixer
c8baaa2995 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-16 12:06:25 +00:00
Laurent Destailleur
fdf4d86d81 Debug code 2019-12-16 12:38:51 +01:00
Laurent Destailleur
646587a9cf Value "None" To unbind is more visible. 2019-12-16 11:50:25 +01:00
John Botella
98bd4f3a66 Fix document module call 2019-12-16 09:44:08 +01:00
Laurent Destailleur
95fc14475c Fix show correct stripe publishable_key on payment mode page 2019-12-15 17:32:45 +01:00
Frédéric FRANCE
9e4fb8d4fe
doxygen 2019-12-15 10:02:20 +01:00
Laurent Destailleur
838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php
 2019-12-14 14:53:49 +01:00
Laurent Destailleur
5e3698b023 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/utils.class.php
 2019-12-14 14:44:38 +01:00
Laurent Destailleur
17b9964678 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/core/class/utils.class.php
	htdocs/core/lib/files.lib.php
 2019-12-14 14:43:14 +01:00
Laurent Destailleur
31a60ff30b Fix $db 2019-12-14 14:41:27 +01:00
Laurent Destailleur
d1daf94b81 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-12-14 14:34:14 +01:00
Laurent Destailleur
a8de7b850a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/admin/system/filecheck.php
 2019-12-14 14:33:46 +01:00
Laurent Destailleur
835d22f556
Merge branch 'develop' into doxygen_todo 2019-12-14 13:46:40 +01:00
Laurent Destailleur
744e7fc5da
Merge pull request #12703 from frederic34/patch-19 
doxygen
 2019-12-14 13:42:58 +01:00
Laurent Destailleur
65bf2fa285
Merge pull request #12689 from code-chicken/develop 
Fix: calculation of virtual stock
 2019-12-14 13:40:02 +01:00
Laurent Destailleur
d38c73c90a FIX output of emails from and error on emailing pages. 2019-12-13 15:52:08 +01:00
Rüdiger Hahn
4dd3cb3469
Prevent stock amount from becoming NULL 
Set stock to 0 if NULL
 2019-12-13 07:58:36 +01:00
Frédéric FRANCE
d4dfa840d9
doxygen 2019-12-12 20:48:14 +01:00
Laurent Destailleur
a612aefab7 Fix HTML5 2019-12-12 11:11:08 +01:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Frédéric FRANCE
9357bfd98e
doxygen 2019-12-12 08:17:14 +01:00
Frédéric FRANCE
66805a502a
doxygen 2019-12-11 22:53:57 +01:00
Frédéric FRANCE
307bad1d2a
doxygen todo 2019-12-11 19:11:13 +01:00
Laurent Destailleur
c0e23c7b71
Merge pull request #12670 from frederic34/patch-7 
The variable $id seems to be never defined
 2019-12-10 05:53:46 +01:00
Frédéric FRANCE
de741f5dd0
The variable $id seems to be never defined 2019-12-09 23:22:13 +01:00
Frédéric FRANCE
a16e342af6
typo 2019-12-09 23:15:15 +01:00
Laurent Destailleur
67401d717a
Merge pull request #12634 from frederic34/patch-7 
The variable $out does not seem to be defined for all execution paths
 2019-12-09 17:44:06 +01:00
Frédéric FRANCE
407fe902b4
missing $db for line 711 2019-12-09 16:42:57 +01:00
Laurent Destailleur
ae6d536d1d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
 2019-12-09 13:32:56 +01:00