Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,625 Commits 36 Branches 189 Tags
a4f44d61a88e787527b34a6d71fc3a2bc6af24d4
Commit Graph

7568 Commits

Author SHA1 Message Date
stickler-ci
6142e42d83 Fixing style errors. 2019-12-31 16:10:36 +00:00
Laurent Destailleur
5a692cecfb Code comment 2019-12-31 17:10:36 +01:00
Laurent Destailleur
9774b05f52 Update commoninvoice.class.php 2019-12-31 17:10:03 +01:00
Laurent Destailleur
a369690e16 Update commoninvoice.class.php 2019-12-31 17:07:56 +01:00
stickler-ci
d3ec867df5 Fixing style errors. 2019-12-31 16:07:07 +00:00
Laurent Destailleur
b3373e8ba5 Update commoninvoice.class.php 2019-12-31 17:06:30 +01:00
Laurent Destailleur
c341ad5e8d Update commoninvoice.class.php 2019-12-31 17:03:00 +01:00
stickler-ci
73e0bca359 Fixing style errors. 2019-12-31 00:13:42 +00:00
jerash
411f20c360 add credit notes and discounts to getListOfPayments 2019-12-31 01:08:25 +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
d5f6ccc7a0 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-23 14:40:36 +01:00
Laurent Destailleur
29cacec886 Fix month when using "Now" button addnowlink = 2 2019-12-23 14:39:24 +01:00
Laurent Destailleur
07c1a5717e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/facture_situation.php
	htdocs/core/class/html.formother.class.php
 2019-12-23 14:16:34 +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
c6ed605d26 Add missing fk_user in import list 2019-12-23 13:49:13 +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