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

45118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mickael Desgranges
57b4cb08b7 Update modSociete.class.php 2014-06-11 13:28:31 +02:00
Mickael Desgranges
81e715f34c Update modSociete.class.php 2014-06-11 12:26:54 +02:00
Mickael Desgranges
84f1b8c02b Add customers/supplier status fo contact export 
When you export a contact list it's usefull to know if your contact is a prospect, client or supplier
 2014-06-11 12:22:24 +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
8a9db28e09 Fix: Use correct name of field. 2014-06-10 08:50:49 +02:00
Laurent Destailleur
3bcb4712c0 Fix: Field must be reset after adding a new line 2014-06-10 08:49:01 +02:00
Laurent Destailleur
47c982c506 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
 2014-06-10 08:45:08 +02:00
Laurent Destailleur
e04822a7c4 Sync from transifex 2014-06-10 02:22:50 +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
ee331db642 Merge pull request #1643 from fappels/develop 
fix: remise_client history
 2014-06-10 01:30:35 +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
c52a494fbe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-06-09 17:26:02 +02:00
Juanjo Menent
8ae2dfbf9e Merge pull request #1646 from marcosgdf/develop 
CR Fix
 2014-06-09 16:18:25 +02:00
Marcos García de La Fuente
ae4bd4445e Moved dol_syslog query log to the database handler and decreased report level to DEBUG 2014-06-09 15:49:54 +02:00
Laurent Destailleur
b124007c8c Merge remote-tracking branch 'origin/3.5' into develop 2014-06-09 15:30:41 +02:00
Marcos García de La Fuente
9344123887 CR Fix 2014-06-09 15:25:31 +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
Laurent Destailleur
803ccc300a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-06-09 14:59:09 +02:00
Laurent Destailleur
8d8ca154f1 Fix: For supplier order/invoice, deselect product when free line is 
selected.
 2014-06-09 14:58:58 +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
BENKE Charles
e30fd28b02 Update facturation1.tpl.php 2014-06-08 14:39:04 +02:00
BENKE Charles
32a1086ff7 Update affIndex.php 2014-06-08 14:36:31 +02:00
BENKE Charles
2503a69f98 Create keypad.js 2014-06-08 14:35:53 +02:00
BENKE Charles
174b4ee6a2 add dynamic keypad on cashdesk 2014-06-08 14:35:07 +02:00
Francis Appels
1460a0b0f1 fix: remise_client history 2014-06-08 12:36:44 +02:00
Laurent Destailleur
918b44ac57 Merge pull request #1639 from Mainmich/patch-1 
Update facture.php foreach wrong argument
 2014-06-07 19:43:38 +02:00