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

69934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
b3b2305651 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/pdf.lib.php
 2018-10-04 17:56:56 +02:00
Laurent Destailleur
9fe5f242a7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-04 17:53:59 +02:00
Laurent Destailleur
13759ea146 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
 2018-10-04 17:53:40 +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
75b9140446
Merge pull request #9672 from atm-florian/8.0 
FIX ressource list with extrafields
 2018-10-04 17:40:42 +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
Laurent Destailleur
301f7349e0
Merge pull request #9656 from fmarcet/8.0 
FIX Can't create shipping if have shipping line's extrafields
 2018-10-04 17:22:24 +02:00
Laurent Destailleur
f6099fba15 Fix phpcs 2018-10-04 16:58:34 +02:00
Laurent Destailleur
1f44380dd1 Clean code 2018-10-04 16:20:55 +02:00
Laurent Destailleur
111d589474 NEW Can mix offset before and after with rules for due date of invoices 2018-10-04 16:06:26 +02:00
Laurent Destailleur
75c968b4ae FIX Backup of database without mysqladmin available from cron. 2018-10-04 13:10:48 +02:00
Laurent Destailleur
7a94f4fc00 Add more logs 2018-10-04 11:34:46 +02:00
Laurent Destailleur
378013b863 Better select language component 2018-10-03 20:58:45 +02:00
Laurent Destailleur
83be1759b1 Work on multilang website 2018-10-03 20:00:52 +02:00
Laurent Destailleur
402175bb49 Work on multilang 2018-10-03 19:53:33 +02:00
Laurent Destailleur
fd859d3162 Add a component to select lang into a web site 2018-10-03 18:40:54 +02:00
Laurent Destailleur
2cd843acec Fix separator too long 2018-10-03 16:02:42 +02:00
florian HENRY
b8c88a2144 rename var 2018-10-03 15:43:00 +02:00
florian HENRY
1b18781299 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0 2018-10-03 15:41:10 +02:00
florian HENRY
ef7ed97866 fix ressource list with extrafields 2018-10-03 15:40:58 +02:00
aplose
8ee7a48583 Fix issue #9434 : no array_options available when calling api : 
I replace the deprecated code by the fetch_optionnals() recommanded call.
 2018-10-03 15:15:46 +02:00
Laurent Destailleur
8ee98315c7 Lang 2018-10-03 13:13:16 +02:00
atm-greg
583ea05567 fix missing letter... 2018-10-03 12:13:53 +02:00
gauthier
587766b39b FIX : wrong function name 2018-10-03 10:38:47 +02:00
Laurent Destailleur
e83149a344 Fix deletion of credit card when no Oauth set 2018-10-02 22:35:51 +02:00
Laurent Destailleur
76f5d53840 Fix deletion of credit card when no Oauth set 2018-10-02 22:34:41 +02:00
Laurent Destailleur
56cb0763d1 Add maincolor property on website 2018-10-02 16:46:54 +02:00
Ferran Marcet
d66b2322c2 FIX Can't create shipping if have shipping line's extrafields 2018-10-02 09:37:44 +02:00
Laurent Destailleur
53b0ac8217 Rename template 2018-10-01 21:25:51 +02:00
Laurent Destailleur
af497271a4 Rename template website 2018-10-01 21:00:54 +02:00
Laurent Destailleur
a8f16f6570 Update template web site 2018-10-01 20:59:17 +02:00
Laurent Destailleur
771922f427 Use 2 distinct left menu entries for leads and projects 2018-10-01 18:56:47 +02:00
Laurent Destailleur
6ed67ea77f Clean code 2018-10-01 13:54:45 +02:00
Laurent Destailleur
957d5958a4 Work on website 2018-10-01 13:09:12 +02:00
Laurent Destailleur
a8385c0255 Translation 2018-10-01 11:30:20 +02:00
Laurent Destailleur
15780f71b4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-01 03:22:20 +02:00
Laurent Destailleur
873f43db94 Uniformize interface for tickets 2018-10-01 03:19:21 +02:00
Laurent Destailleur
367de729ca
Merge pull request #9492 from grandoc/new_branch_13_09_2018 
Standardize and update code
 2018-10-01 02:20:23 +02:00
Laurent Destailleur
1dfbb22bf8
Merge branch 'develop' into new_branch_13_09_2018 2018-10-01 02:20:16 +02:00
Laurent Destailleur
fdd6c8d6bf
Merge pull request #9648 from frederic34/patch-18 
simplify mod_codeclient_monkey.php
 2018-10-01 01:21:08 +02:00
Laurent Destailleur
77dad1b32b
Merge pull request #9647 from frederic34/patch-17 
indentation fix in commonobject class
 2018-10-01 01:20:17 +02:00
Laurent Destailleur
95e16d17ac
Merge pull request #9646 from frederic34/patch-16 
add index.html in user directory #9571
 2018-10-01 01:19:40 +02:00
Laurent Destailleur
93fb945ba2
Merge pull request #9645 from frederic34/patch-15 
remove link to custom in actions_takepos.class.php
 2018-10-01 01:19:20 +02:00
Laurent Destailleur
8ccbdfa39d
Merge pull request #9638 from frederic34/patch-11 
remove $var from takepos admin setup
 2018-10-01 01:16:33 +02:00
Laurent Destailleur
84c062a03d
Merge pull request #9637 from frederic34/patch-10 
add code_compta_client to Societe class
 2018-10-01 01:16:18 +02:00
Laurent Destailleur
5050068e59
Merge pull request #9636 from frederic34/patch-9 
update sql table for takepos module
 2018-10-01 01:16:01 +02:00
Laurent Destailleur
75b1cac33f FIX Pagination stats 2018-10-01 01:15:19 +02:00