lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,477 Commits 43 Branches 150 Tags 886 MiB
8ce8bf47ee
Commit Graph

40477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
8ce8bf47ee Fix: The object deliverycompany was not used anymore and output of 
details for delivery reports was lost during 3.5. Rewrite code to
restore feature.

Conflicts:
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
 2014-06-20 12:48:08 +02:00
Laurent Destailleur
11cb23f4ac Merge pull request #1662 from grandoc/3.5 
Fix : num paiement was not displayed
 2014-06-14 13:28:22 +02:00
Laurent Destailleur
0c5c1cf849 Merge branch '3.5' of github.com:FHenry/dolibarr into 3.5 
Conflicts:
	ChangeLog
 2014-06-14 13:21:32 +02:00
Laurent Destailleur
0453daae72 Merge pull request #1656 from netfab/3.5 
html fix : missing </tr>.
 2014-06-14 12:34:06 +02:00
Laurent Destailleur
710497a081 Merge branch 'bug-1451' of github.com:marcosgdf/dolibarr into 3.5 
Conflicts:
	ChangeLog
 2014-06-14 12:32:59 +02:00
Laurent Destailleur
74a0a9b76e Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-06-14 12:30:56 +02:00
Laurent Destailleur
cf948065f4 Fixes for bug 1449, 1450 and 1451 #1654 2014-06-14 12:30:48 +02:00
Laurent Destailleur
c1e5d65087 Merge branch 'marcosgdf-bug-1432' into 3.5 2014-06-14 12:28:14 +02:00
Laurent Destailleur
c67dad0240 Merge branch 'bug-1432' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1432

Conflicts:
	ChangeLog
 2014-06-14 12:27:47 +02:00
Florian HENRY
42e6727e5d Better error return 2014-06-13 15:56:31 +02:00
Florian HENRY
0916d2cf3b Fix link element from project "associates object" pages 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50687-objet-associes-au-projet
 2014-06-13 15:54:37 +02:00
Florian HENRY
aecede08c4 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-06-13 14:38:44 +02:00
philippe
d508c076e8 Fix : num paiement was not displayed 2014-06-13 12:10:26 +02:00
Laurent Destailleur
1a9e53e21f Fxi: Correct property name 2014-06-12 22:00:16 +02:00
Florian HENRY
40a5d20cc8 Do not reset index on product import !!! 2014-06-12 16:46:20 +02:00
Laurent Destailleur
b4ef780274 Fix: When project was disabled, label was not visible 2014-06-12 15:41:00 +02:00
Laurent Destailleur
1ba02185e5 Fix: Error nor reported 2014-06-12 15:32:25 +02:00
Florian HENRY
f796a6408e Do not display dictionnay for non activated module 2014-06-12 15:28:11 +02:00
Florian HENRY
80facefa23 Fix [ bug #1454 ] Mention de bas de page erroné 2014-06-12 09:13:51 +02:00
Laurent Destailleur
bb8516274e Fix: socid was not caught. 
Fix: numbering modules was not correctly scanned.
 2014-06-11 18:01:15 +02:00
Laurent Destailleur
40742e84a9 Fix: Bad balance of colspan. 
Fix: Filter on status was not visible when selected from url.
Fix: Filtering on status was last when asking to sort.
 2014-06-11 16:47:00 +02:00
Fab
2fed26d68b html fix : missing </tr>. 2014-06-11 08:01:05 +02:00
Marcos García de La Fuente
ff37adf6f1 Fix: [ bug #1451 ] Interrupted order clone through trigger, loads nonexistent order 2014-06-10 13:47:30 +02:00
Marcos García de La Fuente
7cb5cc550f Didn't mean to change this entry of the changelog 2014-06-10 13:41:17 +02:00
Marcos García de La Fuente
0ef89e4060 Corrected ORDER_CLONE trigger error message 2014-06-10 13:40:06 +02:00
Marcos García de La Fuente
b9801a8b3c Missing changelog 2014-06-10 13:32:47 +02:00
Marcos García de La Fuente
5a3fc00b4c Fix: [ bug #1450 ] Several Customer order's triggers do not report the error from the trigger handler 2014-06-10 13:32:17 +02:00
Marcos García de La Fuente
f3807c754c Fixed ORDER_DELETE trigger error message 2014-06-10 12:44:41 +02:00
Marcos García de La Fuente
16b1b0f227 Fixed ORDER_CLASSIFY_BILLED trigger error message 2014-06-10 12:39:04 +02:00
Marcos García de La Fuente
86719bc82a Fixed ORDER_CANCEL trigger error message 2014-06-10 12:35:41 +02:00
Marcos García de La Fuente
08588e2080 Fixed ORDER_REOPEN trigger error message 2014-06-10 12:31:48 +02:00
Marcos García de La Fuente
7ebd231532 Fixed LINEORDER_INSERT interception 2014-06-10 12:23:57 +02:00
Marcos García de La Fuente
95a58ebef8 Fixed LINEORDER_UPDATE interception 2014-06-10 12:23:31 +02:00
Marcos García de La Fuente
6e0ecc4f78 Fixed LINEORDER_DELETE interception 2014-06-10 12:22:43 +02:00
Marcos García de La Fuente
900b182f3c Updated changelog 2014-06-10 12:22:31 +02:00
Marcos García de La Fuente
0c1ba58a00 Fix: [ bug #1449 ] Trigger ORDER_CREATE ignores interception on error 2014-06-10 12:13:27 +02:00
Marcos García de La Fuente
e7cfb719b9 [ bug #1432 ] Trigger SHIPPING_CREATE ignores interception on error 2014-06-10 12:05:31 +02:00
Laurent Destailleur
ae0116aab0 Merge branch 'marcosgdf-bug-1443' into 3.5 2014-06-10 01:43:05 +02:00
Laurent Destailleur
41adaeea99 Merge branch 'bug-1443' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1443

Conflicts:
	ChangeLog
 2014-06-10 01:42:39 +02:00
Laurent Destailleur
ebeda9a271 Merge branch 'marcosgdf-bug-1416' into 3.5 2014-06-10 01:40:55 +02:00
Laurent Destailleur
5853b9eb30 Merge branch 'bug-1416' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1416

Conflicts:
	ChangeLog
 2014-06-10 01:37:43 +02:00
Laurent Destailleur
9e91225936 Merge pull request #1648 from marcosgdf/bug-1415 
Fix: [ bug #1415 ] Intervention document model name and suppliers model names is not shown properly in module configuration
 2014-06-10 01:28:56 +02:00
Marcos García de La Fuente
85d906078a Fix: [ bug #1443 ] Payment conditions is erased after editing supplier invoice label or limit date for payment 2014-06-09 23:50:57 +02:00
Marcos García de La Fuente
0b73b44f34 Fix: [ bug #1416 ] Supplier order does not list document models in the select box of the supplier order card 2014-06-09 23:38:06 +02:00
Marcos García de La Fuente
8a22a708b4 Fixed the bug for supplier invoice and supplier order pages 2014-06-09 22:55:38 +02:00
Marcos García de La Fuente
83b58aca89 Typo 2014-06-09 22:49:27 +02:00
Marcos García de La Fuente
0810e6756a Fix: [ bug #1415 ] Intervention document model name and suppliers model names is not shown properly in module configuration 2014-06-09 22:48:16 +02:00
Laurent Destailleur
4c3c62515d Fix: Confusion between is_int and is_numeric. 2014-06-09 15:21:20 +02:00
Laurent Destailleur
9ba4b53a88 Merge pull request #1645 from FHenry/3.5 
Start fix [ bug #1437 ] Securitu Issue
 2014-06-09 15:10:55 +02:00
Florian HENRY
77a9d4eb71 Start fix [ bug #1437 ] Securitu Issue 
Some of them can be fix, because GETPOST even with 'alpha' test do not
warn if input is
"2%2F0%2F1234%3cscript%3ealert%2893275%29%3c%2fscript%3e"
for exemple

I don't have magical solution for this kind of security issue
 2014-06-09 12:34:10 +02:00