Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 17:02:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,848 Commits 39 Branches 191 Tags
f8b0e535fae484348da17099e3747b0823ce52f6
Commit Graph

68848 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
florian HENRY
68c99d01a7 OMG!!!! var_dump.... 2018-10-05 10:35:32 +02:00
ptibogxiv
0e83863d45 Add save or not source functionnality 2018-10-04 20:32:49 +02:00
ptibogxiv
f5966e6303 Update newpayment.php 2018-10-04 19:29:52 +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
571bc86836 Update newpayment.php 2018-10-04 19:03:18 +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
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
atm-ph
bfaf25ca2a Fix wrong value for module part and return access denied 2018-10-04 16:55:16 +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
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
atm-ph
2acd69033c Fix minor error in dom 2018-10-03 22:48:29 +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
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
Chl
b578913d2b FIX correct migration of old postgresql unique key 2018-10-02 23:18:47 +02:00
Laurent Destailleur
e83149a344 Fix deletion of credit card when no Oauth set 2018-10-02 22:35:51 +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
75b1cac33f FIX Pagination stats 2018-10-01 01:15:19 +02:00
Alexandre SPANGARO
14627abb27 FIX Title problem on admin RSS module 2018-10-01 01:14:43 +02:00
Laurent Destailleur
c07ab81e6a Fix trans 2018-09-28 02:22:23 +02:00
Philippe
06fe172669 FIX Product marge tabs on product card 
Credit note are not negative so the grand total are false
 2018-09-27 20:06:00 +02:00
Philippe
8deb2eaa0c Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0 2018-09-27 19:00:09 +02:00
Laurent Destailleur
575c63f87d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2018-09-27 12:52:10 +02:00
Laurent Destailleur
6e7fd15e1e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-27 12:48:08 +02:00
Laurent Destailleur
291d477f65 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-09-27 12:47:48 +02:00
Laurent Destailleur
7b86776f6b Introduce option MAIN_INCLUDE_ZERO_VAT_IN_REPORTS to solve a regression 
on feature to report vat by rate when rate is zero
 2018-09-27 12:42:52 +02:00
Laurent Destailleur
96c1814793 FIX XSS vulnerability reported by Mary Princy E 2018-09-27 11:33:28 +02:00
Laurent Destailleur
4c8664b297 Merge pull request #9619 from ATM-Marc/FIX_6.0_extrafield_columns 
FIX: showOptionals: column mismatches
 2018-09-27 09:39:51 +02:00
Carsten Brandt
fee46ac845 Update german accounting file to use rowid 
- fix "TODO Fix this file to use rowid"
 2018-09-27 09:39:00 +02:00
Laurent Destailleur
2d88b69cf6 Merge pull request #9616 from frederic34/patch-14 
add try catch for swiftmailer
 2018-09-27 09:34:21 +02:00