Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-21 08:51:24 +01:00
Code Issues Packages Projects Releases Wiki Activity
71,221 Commits 36 Branches 190 Tags
0a057c8277b26e2429b51f9f2c54e81a0445fd6c
Commit Graph

71221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric FRANCE
550dc622ca code comment 2018-10-20 13:40:40 +02:00
Alexandre SPANGARO
a7de7013a1 Update code 2018-10-20 11:20:53 +02:00
Alexandre SPANGARO
921757c4a3 Fix travis 2018-10-20 10:57:59 +02:00
Alexandre SPANGARO
5cbcef4465 Debug Lettering 2018-10-20 08:26:30 +02:00
Alexandre SPANGARO
d3856d9289 Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy 2018-10-20 06:35:39 +02:00
Frédéric FRANCE
f322c73dd7 Update ajax.lib.php 2018-10-19 22:52:18 +02:00
Frédéric FRANCE
042118fe38 fix it 2018-10-19 18:35:16 +02:00
Frédéric FRANCE
c811d5a371 fix new pdf 2018-10-19 18:20:06 +02:00
De Coninck Laurent
402bbbe839 fix the member e-mail on resign and validation. 
Since the member module is only using the new configuration and the name of the global variabels changed you have a blocking e-mail error when you try to resign or validate a member. In order to fix that I fallback on the previous variable like that it's still working.

[see: #9640]
 2018-10-19 17:23:53 +02:00
Laurent Destailleur
fecb6e49c6 Merge pull request #9014 from atm-john/NEW_PDF_DOCUMENT_COLUMN_new_files 
Experimental new pdf documents  using new column system
 2018-10-19 15:51:54 +02:00
Laurent Destailleur
4571210bcf Fix remove deprecated field 2018-10-19 15:45:56 +02:00
Laurent Destailleur
897a2b09a7 Removed scrutinizer warning 2018-10-19 15:02:54 +02:00
Laurent Destailleur
b32ffdbbb9 Clean code 2018-10-19 14:59:00 +02:00
Laurent Destailleur
0408d123ec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 14:46:39 +02:00
Laurent Destailleur
e4b5cc154e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 14:46:32 +02:00
Laurent Destailleur
33cd0e84d2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2018-10-19 14:44:50 +02:00
Laurent Destailleur
57ad200ae5 Fix regression in creating discount 2018-10-19 14:43:10 +02:00
Laurent Destailleur
5a228bf394 Merge pull request #9786 from aspangaro/9.0_accountancy2 
Fix FEC on accountancy movement card
 2018-10-19 14:33:46 +02:00
Laurent Destailleur
4e82a6da46 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 14:29:32 +02:00
Laurent Destailleur
6a6a8ae14b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 14:29:22 +02:00
Laurent Destailleur
91745491ff Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-19 14:27:37 +02:00
Laurent Destailleur
5a1a5548df Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/societe/class/societe.class.php
 2018-10-19 14:27:15 +02:00
Laurent Destailleur
47abbd3eb2 Fix bad merge 2018-10-19 14:23:36 +02:00
Laurent Destailleur
13171b0b55 Merge pull request #9781 from frederic34/patch-17 
do not trim int
 2018-10-19 14:18:32 +02:00
Laurent Destailleur
36ae81c749 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-19 14:17:20 +02:00
Laurent Destailleur
de4ead2558 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/accountancy/class/accountancycategory.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/product/reassort.php
 2018-10-19 14:16:53 +02:00
Laurent Destailleur
6fde6e4250 Merge pull request #9787 from fmarcet/6.0 
FIX: When delete a product, llx_product_association rows are not deleted
 2018-10-19 14:06:50 +02:00
Laurent Destailleur
6d1a934e8d Merge pull request #9792 from atm-greg/Disable_customerprospect_thirdparty_type 
NEW Add configuration to disable "customer/prospect" thirdparty type
 2018-10-19 13:47:33 +02:00
Laurent Destailleur
c1d2556965 Update admin.lang 2018-10-19 13:47:18 +02:00
Laurent Destailleur
b6cb16a457 Merge pull request #9783 from frederic34/patch-18 
Update menubase.class.php
 2018-10-19 13:44:11 +02:00
Laurent Destailleur
86216960d4 Merge pull request #9785 from ptibogxiv/patch-81 
NEW ADD civility list in API
 2018-10-19 13:41:20 +02:00
Laurent Destailleur
078654b114 Merge pull request #9782 from ptibogxiv/patch-79 
FIX uniformization dates of order in API
 2018-10-19 13:39:10 +02:00
Laurent Destailleur
5f309bf155 Update commande.class.php 2018-10-19 13:38:23 +02:00
Laurent Destailleur
762d82f2fe Move declaration into common 2018-10-19 13:38:05 +02:00
Laurent Destailleur
cff2b923f9 Merge pull request #9784 from ptibogxiv/patch-80 
FIX harmony in date name with API
 2018-10-19 13:29:59 +02:00
Laurent Destailleur
7493e0a8be Merge pull request #9799 from salbertson/patch-1 
Add "Reviewed by Hound" badge
 2018-10-19 13:29:05 +02:00
Laurent Destailleur
5e650bcc1f Merge pull request #9791 from atm-gauthier/7.0_fix_discount_with_multicurrency 
FIX : use discount with multicurrency
 2018-10-19 13:27:08 +02:00
Laurent Destailleur
5a9f0cbff7 Merge pull request #9796 from frederic34/patch-21 
do not trim int
 2018-10-19 13:26:08 +02:00
Laurent Destailleur
ee4f6602cc Merge pull request #9795 from frederic34/patch-20 
do not trim int
 2018-10-19 13:25:39 +02:00
Laurent Destailleur
b12769e5c1 Merge pull request #9803 from simnandez/develop 
NEW Child label of variants change if parent label changes
 2018-10-19 13:23:35 +02:00
Laurent Destailleur
8a88b66c9d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 13:18:28 +02:00
Laurent Destailleur
932a993b86 Merge pull request #9810 from andreubisquerra/master 
Fix delete without any selected line on takepos
 2018-10-19 13:18:07 +02:00
Laurent Destailleur
c13e555d5f Merge pull request #9811 from frederic34/patch-24 
use strict comparaison
 2018-10-19 13:17:24 +02:00
Laurent Destailleur
24ae38abcc Merge pull request #9797 from frederic34/patch-22 
do not trim int
 2018-10-19 13:03:03 +02:00
Laurent Destailleur
8af16609ca Merge pull request #9779 from frederic34/patch-15 
Update html.formmail.class.php
 2018-10-19 13:02:15 +02:00
Laurent Destailleur
324f59ecc9 Merge pull request #9778 from frederic34/patch-9 
add errors def to form class
 2018-10-19 13:01:31 +02:00
Laurent Destailleur
0e33f18a3a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 12:58:31 +02:00
Laurent Destailleur
d086a71104 Merge pull request #9780 from frederic34/patch-16 
fix phpunit
 2018-10-19 12:58:15 +02:00
Laurent Destailleur
c01e6591ed Merge pull request #9798 from frederic34/patch-23 
code comment
 2018-10-19 12:57:25 +02:00
Laurent Destailleur
c4e67de5c9 Merge pull request #9814 from Mavyre/patch-2 
Fixed all resources displaying on add in projects, events...
 2018-10-19 12:57:07 +02:00