Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-23 09:51:33 +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
Laurent Destailleur
31916c94f0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-04 17:57:20 +02:00
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
1c735ea6d5 Merge pull request #9673 from atm-florian/dev_resource 
NEW : add event tab on resource card
 2018-10-04 17:45:01 +02:00
Laurent Destailleur
2aca9cb394 Update company.lib.php 2018-10-04 17:44:47 +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
3b7af822db Merge pull request #9663 from frederic34/patch-18 
add missing translation key found in box graph
 2018-10-04 17:26:42 +02:00
Laurent Destailleur
ba3552558c Merge pull request #9662 from frederic34/patch-17 
remove useless param
 2018-10-04 17:26:21 +02:00
Laurent Destailleur
9f2a2be837 Merge pull request #9661 from frederic34/patch-16 
remove useless phpcs:disable
 2018-10-04 17:25:44 +02:00
Laurent Destailleur
0fd7a5a172 Merge pull request #9659 from frederic34/patch-15 
typo in template
 2018-10-04 17:22:47 +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
34f1691302 Merge pull request #9655 from frederic34/patch-11 
group same condition into one in html.formprojet.class.php
 2018-10-04 17:15:15 +02:00
Laurent Destailleur
16aef0e9fc Merge pull request #9651 from frederic34/patch-9 
fix td filecheck
 2018-10-04 17:09:46 +02:00
Laurent Destailleur
9e95ae0e3a Merge pull request #9650 from bafbes/abb80017 
Fix : backtopage link in listings
 2018-10-04 17:09:25 +02:00
Laurent Destailleur
dec313810d Update myobject_list.php 2018-10-04 17:09:19 +02:00
Laurent Destailleur
3a0d777df7 Merge pull request #9649 from lex111/replaces-load 
Replace multiple load calls with loadLangs method
 2018-10-04 17:05:48 +02:00
Laurent Destailleur
f6099fba15 Fix phpcs 2018-10-04 16:58:34 +02:00
atm-ph
bfaf25ca2a Fix wrong value for module part and return access denied 2018-10-04 16:55:16 +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
ptibogxiv
762abf7060 Update newpayment.php 2018-10-04 10:59:06 +02:00
atm-ph
58d1ac427e Fix missing hook on sellsjournal 2018-10-04 10:57:22 +02:00
ptibogxiv
d36dda37e6 Fix metadata for charge.php 
Fix for dol_id, dol_type
 2018-10-04 10:56:29 +02:00
Philippe GRAND
e045d0e9ac Translation 2018-10-04 09:55:05 +02:00
ATM-Nicolas
c048f51562 FIX : Wrong variable name 2018-10-04 09:54:40 +02:00
florian HENRY
e95921eb93 better test 2018-10-04 09:47:04 +02:00
florian HENRY
7f4f27ebfe indent 2018-10-04 09:45:12 +02:00
florian HENRY
292dab192b FIX : #9161 2018-10-04 09:42:11 +02:00
Philippe GRAND
8bee69277d Standardize and update code 2018-10-04 09:33:30 +02:00
Philippe GRAND
d2ec703b51 Standardize and update code 2018-10-04 09:24:57 +02:00
Philippe GRAND
c32b96c207 Standardize and update code 2018-10-04 09:15:15 +02:00
atm-ph
2acd69033c Fix minor error in dom 2018-10-03 22:48:29 +02:00
florian HENRY
d09bbe4690 NEW : add event tab on resource card 2018-10-03 21:13:02 +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