lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
65,600 Commits 43 Branches 150 Tags 886 MiB
5e650bcc1f
Commit Graph

65600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
gauthier
aea7299970 FIX : use discount with multicurrency 2018-10-17 15:49:08 +02:00
Laurent Destailleur
33031450a3
Merge pull request #9747 from atm-maxime/fix_status_tobatch 
Fix missing status_batch var on product lists #9606
 2018-10-16 20:02:56 +02:00
Laurent Destailleur
d56c237d4e
Merge pull request #9756 from atm-maxime/fix_refused_proposal_in_total 
Fix refused proposals were counted in totals in project overview
 2018-10-16 19:46:19 +02:00
Laurent Destailleur
575038d3a3
Merge pull request #9769 from atm-ph/fix_7.0_list_duplicate_extrafield_value 
Fix list from 'Contacts/Addresses' on company may show duplicate valu…
 2018-10-16 19:36:37 +02:00
atm-ph
72dd182b1f Fix list from 'Contacts/Addresses' on company may show duplicate value for extrafields 2018-10-16 18:22:43 +02:00
Maxime Kohlhaas
dfe239bf8d Fix refused proposals were counted in totals in project overview 2018-10-15 16:58:53 +02:00
Maxime Kohlhaas
af813f8214 Fix missing status_batch var on product lists #9606 2018-10-14 19:55:25 +02:00
Laurent Destailleur
aedc6fadf4
Merge pull request #9740 from frederic34/patch-14 
reduce complexity of payments.lib.php
 2018-10-14 16:27:31 +02:00
Frédéric FRANCE
787658ac98
reduce complexity of payments.lib.php 2018-10-14 10:56:03 +02:00
Laurent Destailleur
c15505bc13 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-13 14:27:50 +02:00
Laurent Destailleur
76e6968a21
Merge pull request #9730 from atm-ph/fix_7.0_extrafield_date_not_show 
Fix extrafield contact typed as date isn't show in the list from 'con…
 2018-10-13 12:03:07 +02:00
atm-ph
e2748953c3 Fix print extrafield date in list 2018-10-12 22:31:47 +02:00
Laurent Destailleur
87f744896d
Merge pull request #9733 from ATM-Marc/FIX_6.0_propal_customcode 
FIX: propal pdf: missing parenthesis for customs code
 2018-10-12 21:14:40 +02:00
Laurent Destailleur
b78932b9f7 Prepare 7.0.5 2018-10-12 21:11:40 +02:00
Laurent Destailleur
bd60fe6ffd Prepare 7.0.4 2018-10-12 19:13:11 +02:00
Laurent Destailleur
bb606df5e0 Prepare 7.0.4 2018-10-12 19:12:20 +02:00
Laurent Destailleur
067b29c9f8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-12 19:09:45 +02:00
Laurent Destailleur
9f27dd41e5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
 2018-10-12 19:08:06 +02:00
Laurent Destailleur
d4b02c0552 Release 6.0.8 2018-10-12 19:03:03 +02:00
Marc de Lima Lucio
afd9b4ea1a FIX: propal pdf: missing parenthesis for customs code 2018-10-12 18:19:17 +02:00
Laurent Destailleur
fd46ae13d6
Merge pull request #9731 from atm-ph/fix_7.0_empty_column_physical_stock 
Fix display 0 (as virtual stock) instead of empty string
 2018-10-12 18:17:04 +02:00
Laurent Destailleur
2fdc1a9883
Merge pull request #9718 from frederic34/patch-9 
define $code for all execution paths
 2018-10-12 17:42:07 +02:00
Laurent Destailleur
817920f282 Prepare 6.0.8 2018-10-12 17:36:49 +02:00
atm-ph
79420593f4 Fix display 0 (as virtual stock) instead of empty string 2018-10-11 17:14:22 +02:00
atm-ph
4b32c8e100 Fix extrafield contact typed as date isn't show in the list from 'contact/address' tab of company 2018-10-11 14:24:55 +02:00
Frédéric FRANCE
c3f07dd2e0
define $code for all execution paths 2018-10-09 19:28:52 +02:00
Laurent Destailleur
84605bc59b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-09 16:59:47 +02:00
Laurent Destailleur
430f833222
Merge pull request #9626 from OPEN-DSI/fix_product_margin 
FIX Product margin tab and credit note
 2018-10-09 16:57:08 +02:00
Laurent Destailleur
bd8cf3d81e
Merge pull request #9704 from atm-gauthier/7.0_fix_userlist 
FIX : when we're just admin and not super admin, if we create new use…
 2018-10-09 16:17:49 +02:00
Laurent Destailleur
67e7736eb2
Merge pull request #9698 from Dolibarr/atm-maxime-patch-1 
Fix request on project overview
 2018-10-09 12:40:51 +02:00
gauthier
021f9552dd FIX : when we're just admin and not super admin, if we create new user with transverse mode, we don't see it then we can't add him in usergroup 2018-10-08 15:41:31 +02:00
Maxime Kohlhaas
320ca3db67
Fix request on project overview 
Fixes #9220
 2018-10-06 22:53:28 +02:00
Laurent Destailleur
e165dce908
Merge pull request #9689 from ATM-Marc/FIX_6.0_facture_stats_situation 
FIX: invoice stats: situation invoices were not counted
 2018-10-06 12:46:25 +02:00
Laurent Destailleur
a97dafc1f2
Merge pull request #9688 from atm-florian/7.0_fix9161 
7.0 fix9161
 2018-10-06 12:40:42 +02:00
Marc de Lima Lucio
82651cd920 FIX: invoice stats: situation invoices were not counted 2018-10-05 12:12:04 +02:00
florian HENRY
cba4676032 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_fix9161 2018-10-05 10:36:03 +02:00
florian HENRY
68c99d01a7 OMG!!!! var_dump.... 2018-10-05 10:35:32 +02:00
Laurent Destailleur
b20dc5678c
Merge pull request #9684 from atm-ph/fix_7.0_wrong_modulepart_name 
FIX wrong value for module part and return access denied
 2018-10-04 19:06:53 +02:00
Laurent Destailleur
8592b03b49
Merge pull request #9682 from atm-ph/fix_7.0_missing_hook 
Fix missing hook on sellsjournal
 2018-10-04 19:06:02 +02:00
Laurent Destailleur
17e4af50ec
Merge pull request #9680 from ATM-Nicolas/fix_wrong_variable_name 
FIX : Wrong variable name
 2018-10-04 18:47:08 +02:00
Laurent Destailleur
ac86eac508
Merge pull request #9675 from atm-ph/fix_7.0_dom_error 
Fix minor error in dom
 2018-10-04 18:32:52 +02:00
Laurent Destailleur
3060647212 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2018-10-04 17:50:19 +02:00
Laurent Destailleur
8690d65479 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2018-10-04 17:47:22 +02:00
Laurent Destailleur
577192554d
Merge pull request #9670 from oas-services/7.0 
Fix issue #9434 : no array_options available when calling api on order line and invoice line
 2018-10-04 17:39:37 +02:00
Laurent Destailleur
9e397206d3
Merge pull request #9668 from atm-greg/Fix_pdf_generation 
fix error 500 on pdf_generation
 2018-10-04 17:27:29 +02:00
Laurent Destailleur
1dd276b046
Merge pull request #9666 from atm-gauthier/7.0_wrongfunction 
FIX : wrong function name
 2018-10-04 17:26:59 +02:00
atm-ph
bfaf25ca2a Fix wrong value for module part and return access denied 2018-10-04 16:55:16 +02:00
atm-ph
58d1ac427e Fix missing hook on sellsjournal 2018-10-04 10:57:22 +02:00
ATM-Nicolas
c048f51562 FIX : Wrong variable name 2018-10-04 09:54:40 +02:00