lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
69,097 Commits 43 Branches 150 Tags 886 MiB
9a9fd15077
Commit Graph

69097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
9a9fd15077 Fix doxygen 2019-03-07 14:10:33 +01:00
Laurent Destailleur
d2f1d0cc33 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2019-03-07 14:06:11 +01:00
Laurent Destailleur
e96f84a3d6
Merge pull request #10765 from altatof/sd8 
FIX : supplier discount was not retrieved when choosing a product
 2019-03-07 13:26:44 +01:00
Laurent Destailleur
0349f9bfaa
Update objectline_create.tpl.php 2019-03-07 13:26:25 +01:00
Laurent Destailleur
2ae3d75df4
Merge pull request #10752 from atm-gauthier/7.0_fix_fourninvoice_specialcode 
FIX : we need to keep originline special_code
 2019-03-07 12:29:00 +01:00
Laurent Destailleur
e3fb228a4d
Update fournisseur.facture.class.php 2019-03-07 12:28:19 +01:00
Christophe Battarel
96b8da0d62 fix supllier discount 2019-03-06 22:04:01 +01:00
gauthier
0ff2905180 FIX : we need to keep originline special_code 2019-03-06 12:10:24 +01:00
Laurent Destailleur
3db8218cba
Merge pull request #10745 from frederic34/patch-6 
add session newtoken
 2019-03-05 18:41:50 +01:00
Laurent Destailleur
98f5bb2ed3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-05 15:55:08 +01:00
Frédéric FRANCE
1bbf6737ec
add session newtoken 2019-03-05 15:27:31 +01:00
Laurent Destailleur
54b9681257 More log to help debug 2019-03-04 20:15:31 +01:00
Laurent Destailleur
acaf5cabef
Merge pull request #10332 from ATM-Nicolas/fix_check_picture_name 
FIX : Check for old picture name if the new one was not found
 2019-03-04 16:20:29 +01:00
Laurent Destailleur
76dd9e42d2
Merge pull request #10726 from frederic34/patch-3 
Update DolibarrModules.class.php
 2019-03-04 16:05:06 +01:00
Laurent Destailleur
526bd1d02e Fix number format 2019-03-03 17:36:43 +01:00
Frédéric FRANCE
3037e4a157
Update DolibarrModules.class.php 2019-03-02 20:49:53 +01:00
Laurent Destailleur
aea5abd9a1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-02 19:05:58 +01:00
Laurent Destailleur
8f8aaf1e8c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-02 19:05:51 +01:00
Laurent Destailleur
a2eefab696
Merge pull request #10714 from ATM-Marc/FIX_7.0_export_actioncomm 
FIX: actioncomm export: ORDER BY clause / event type filter
 2019-03-02 18:44:34 +01:00
Laurent Destailleur
bc9218dee3
Merge pull request #10713 from atm-gauthier/8.0_fix_title_project 
FIX : project_title for display of getNomUrl()
 2019-03-02 18:36:42 +01:00
Marc de Lima Lucio
b96ac794e9 FIX: actioncomm export: ORDER BY clause is in wrong export property + event type filter does not work 2019-02-28 16:15:32 +01:00
gauthier
786c114026 FIX : project_title for display of getNomUrl() 2019-02-28 16:13:45 +01:00
Laurent Destailleur
c9d240cb73
Merge pull request #10671 from hregis/8.0_mc 
FIX could not create several superadmin in transversal mode
 2019-02-28 12:24:50 +01:00
Laurent Destailleur
855aaaffd8 Better fix for type of discount 2019-02-28 11:44:10 +01:00
Laurent Destailleur
92259810c1
Merge pull request #10712 from atm-florian/8.0 
fix relative discount for prospect and supplier
 2019-02-28 11:26:50 +01:00
Laurent Destailleur
74dec41496
Merge pull request #10705 from atm-gauthier/8.0_fix_best_error_msg 
FIX : if empty error message, we just see "error" displayed
 2019-02-28 11:25:13 +01:00
Laurent Destailleur
cefaeb583f
Update xinputfile.modules.php 2019-02-28 11:24:43 +01:00
Laurent Destailleur
85d46a5270
Update xinputfile.modules.php 2019-02-28 11:24:07 +01:00
florian HENRY
4ebf4780c2 fix relative discount for prospect and supplier 2019-02-28 09:09:06 +01:00
gauthier
1237a6d3e9 FIX : same thing here 2019-02-27 14:58:10 +01:00
gauthier
49e03b009f FIX : if empty error message, we just see "error" displayed 2019-02-27 14:50:01 +01:00
Laurent Destailleur
86e2ffe323
Merge pull request #10390 from glu000/8.0 
Fix #10278
 2019-02-27 02:24:55 +01:00
Laurent Destailleur
238894a7e4
Merge pull request #10624 from frederic34/patch-2 
selectMulticurrency avoid malformed empty value
 2019-02-27 02:06:24 +01:00
Laurent Destailleur
a48e9fdba4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-02-27 01:23:26 +01:00
Laurent Destailleur
c1fa48889e
Merge pull request #10677 from frederic34/patch-6 
fix #10385
 2019-02-24 20:46:04 +01:00
Laurent Destailleur
6fdd0191f4
Merge pull request #10676 from frederic34/patch-5 
fix #10656
 2019-02-24 20:45:13 +01:00
Laurent Destailleur
2f300ae63f Standardize code with customer invoices 2019-02-24 20:26:54 +01:00
Laurent Destailleur
f41d504ba1
Merge pull request #10518 from atm-greg/8.0_FIX_bad_values_in_fourn_credit_note 
FIX positive values IN supplier credit notes creating diff on addline rounding
 2019-02-24 20:21:22 +01:00
Frédéric FRANCE
2ad91213b2
Update combinations.php 2019-02-24 12:09:57 +01:00
Frédéric FRANCE
ca2eba866c
Update list.php 2019-02-24 11:56:17 +01:00
Frédéric FRANCE
435b416f93
fix #10656 2019-02-24 11:50:06 +01:00
Regis Houssin
0ea7bf3b0b FIX could not create several superadmin in transversal mode 2019-02-24 08:21:56 +01:00
Laurent Destailleur
4e19a83f1b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-02-23 16:01:38 +01:00
Laurent Destailleur
af6c482f26 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-02-23 16:01:30 +01:00
Laurent Destailleur
f2a73eecf2
Merge pull request #10645 from atm-gauthier/7.0_fix_feature_not_finished 
FIX : function sendEmailsReminder isn't completely developed, then MA…
 2019-02-23 15:01:44 +01:00
Laurent Destailleur
4c32aed2f4
Merge pull request #10650 from fappels/8.0_fix_dispatch 
FIX fk_default_warehouse missing in group by
 2019-02-23 14:08:28 +01:00
Francis Appels
c38b0c4dbe FIX fk_default_warehouse missing in group by 2019-02-22 12:17:34 +01:00
gauthier
58d82eb477 FIX : function sendEmailsReminder isn't completely developed, then MAIN_FEATURES_LEVEL must be 2 to "use" it 2019-02-21 11:08:55 +01:00
Laurent Destailleur
ad7b8371da FIX Mark credit note as available for credit note in other currency 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/core/class/discount.class.php
 2019-02-18 18:30:15 +01:00
Frédéric FRANCE
b017213131
selectMulticurrency avoid malformed empty value 2019-02-17 20:59:39 +01:00