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

37132 Commits

Author SHA1 Message Date
Florian HENRY
832d1b37c1 Save also code of event 2014-09-02 11:32:38 +02:00
Florian HENRY
911aca399d save code event 2014-09-02 11:30:35 +02:00
Florian HENRY
c8a9f4600c Fix: list event view lost type event filter 2014-09-02 11:20:57 +02:00
Florian HENRY
67b308cb25 Fix: list event view lost type event filter 2014-09-02 11:15:01 +02:00
Florian HENRY
e2fac5dd91 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 
Conflicts:
	ChangeLog
 2014-09-01 19:10:18 +02:00
Florian HENRY
772acd6bf9 Fix missing $user in create method 2014-09-01 18:32:36 +02:00
Juanjo Menent
4372c58714 Fix: Unsubscribe emailing not working 2014-09-01 18:24:25 +02:00
Florian HENRY
0473bc5138 Fix missing $user into create call categorie 2014-09-01 11:51:16 +02:00
Florian HENRY
bff33166a5 Fix missing $user in create method 2014-09-01 11:49:44 +02:00
Florian HENRY
fd03f582c9 Fix SQL syntax 2014-08-31 12:38:33 +02:00
Laurent Destailleur
20475ba3e8 Fix: sql request not compatible with pgsql 
Conflicts:
	htdocs/core/ajax/ziptown.php
 2014-08-30 20:19:27 +02:00
Laurent Destailleur
2d14e53b45 Fix: Pb with pgsql 2014-08-30 20:00:42 +02:00
jfefe
b7a2e3783e Fix : missing translations 2014-08-30 11:11:51 +02:00
jfefe
71afc4adb0 Fix : missing actions for resource element 2014-08-30 11:11:32 +02:00
jfefe
2c68317864 Fix : bad sql request when linking resource to an element 2014-08-30 10:23:58 +02:00
Laurent Destailleur
47339d0e62 Fix: Missing field tobuy into service export. 
Fix: Filter on date into export.
Fix: Tooltip help.
 2014-08-29 20:26:27 +02:00
Regis Houssin
ff04729a07 Fix: strict mode 2014-08-28 19:38:18 +02:00
Regis Houssin
1aad1b6acd Fix: strict mode 2014-08-28 19:32:41 +02:00
Regis Houssin
48f9ef2574 Fix: php strict mode saga 2014-08-28 15:53:29 +02:00
Regis Houssin
2c46c20dfb Fix: php strict mode saga 2014-08-28 15:52:58 +02:00
Regis Houssin
714da05034 Fix: another strict mode alert 2014-08-28 15:36:22 +02:00
Regis Houssin
4fdd98c4a7 Fix: another strict mode alert 2014-08-28 15:34:50 +02:00
Juanjo Menent
0e1f22fe26 Fix: Salary payments are not reflected on the reporting sheets 2014-08-28 15:16:14 +02:00
Laurent Destailleur
1505ade3db Fix error management: When an error is returned by hooks into 
dol_move_uploaded_file, message must be returned by function as if it
were an error for any other reason.

Conflicts:
	htdocs/core/lib/files.lib.php
 2014-08-28 15:14:06 +02:00
Laurent Destailleur
d3a3e8786e Fix: sql request with pgsql 2014-08-28 15:08:24 +02:00
Laurent Destailleur
79b081a7b7 Merge pull request #1845 from Cubexed/patch-1 
Fix unable to delete order line
 2014-08-28 12:00:21 +02:00
Laurent Destailleur
f1993e719f Merge pull request #1846 from aspangaro/3.6 
Fix :: llx_c_type_resource when you update from a 3.6-beta
 2014-08-28 11:55:18 +02:00
Laurent Destailleur
14ec2cd1d9 Merge pull request #1851 from grandoc/3.6 
fix : missing translation
 2014-08-28 11:53:00 +02:00
Regis Houssin
a446318649 Fix: strict mode anarchy ;-) 
check your variable please
 2014-08-27 19:03:32 +02:00
Regis Houssin
34561906fc Fix: strict mode anarchy ;-) 
check your variable please
 2014-08-27 19:03:01 +02:00
Philippe GRAND
08c621037c fix : missing code for extrafields 2014-08-27 11:41:18 +02:00
Philippe GRAND
61ae2f3f37 fix : missing translation 2014-08-27 11:34:24 +02:00
Regis Houssin
0674667932 Fix: error with php strict mode 2014-08-27 10:46:42 +02:00
Regis Houssin
cdd716eb9d Fix: error with php strict mode 2014-08-27 10:44:40 +02:00
Laurent Destailleur
12c6752971 Fix: Can upload files on services. 2014-08-26 23:45:02 +02:00
braito4
f5883741bf Update fiche.php 
Proyect selection was missing
 2014-08-26 20:20:29 +02:00
Regis Houssin
ca7ff0ecfa Fix: error in strict mode 2014-08-26 09:50:26 +02:00
Regis Houssin
28ad819ab4 Fix: error in strict mode 2014-08-26 09:49:15 +02:00
aspangaro
b7daef10c6 Fix llx_c_type_resource when you update from a 3.6-beta 2014-08-26 04:35:22 +02:00
aspangaro
b561d48b5f Merge branch 'Upstream/3.6' 2014-08-26 04:20:46 +02:00
Cubexed
a97241f716 Fix unable to delete order line 
Calling trigger without having globalized $conf causes error and cancels delete operation, this commit adds the missing

2014-08-23 16:52:05 ERR     127.0.0.1        Interfaces::run_triggers was called with wrong parameters action=LINEORDER_SUPPLIER_DELETE object=1 user= langs= conf=
 2014-08-23 17:05:08 +02:00
Alexis Algoud
a353f816e3 FIX error sql on update ficheinter 2014-08-23 14:33:49 +02:00
Alexis Algoud
b0163fbed2 FIX error sql on update ficheinter 2014-08-22 16:17:45 +02:00
aspangaro
a2f0866c0c Merge branch 'Upstream/3.6' 2014-08-22 07:07:18 +02:00
Laurent Destailleur
2cba55758b Merge branch 'fix_1544' of github.com:KreizIT/dolibarr into 
KreizIT-fix_1544

Conflicts:
	ChangeLog
 2014-08-21 23:29:38 +02:00
Laurent Destailleur
a32791f79d Merge pull request #1839 from aspangaro/3.6 
Fix :: Sql problem for fresh install on resource table
 2014-08-21 23:20:44 +02:00
Laurent Destailleur
8f18db8e3f Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-08-21 23:19:18 +02:00
Laurent Destailleur
d485e270b9 Fix: menu param is not inside allowed list 2014-08-21 23:19:01 +02:00
Laurent Destailleur
c21b389462 Fix: Pb with focus position with ckeditor 2014-08-21 14:17:27 +02:00
aspangaro
2f4e1f09e6 Fix :: Entries salaries into menu doesn't appears when this module is activated alone - Needed module tax at the moment 2014-08-21 06:47:24 +02:00
aspangaro
03f642e861 Merge branch 'Upstream/3.6' 2014-08-21 06:03:00 +02:00
aspangaro
2aa3995b73 Fix :: Sql problem for fresh install on resource table // Ok in migration script 2014-08-21 06:01:47 +02:00
Laurent Destailleur
ee65e42b1c The "final ref" of an object must be set only once all database actions 
are ok. So after trigger call.
If a trigger need to know new information on an object, trigger must
make a fetch on object.

Revert "Fix: define new ref before trigger"

This reverts commit cb2b6e6e40.
 2014-08-19 14:57:01 +02:00
Regis Houssin
cb2b6e6e40 Fix: define new ref before trigger 2014-08-18 20:28:58 +02:00
Regis Houssin
9fdfc740de Fix: define new ref before trigger 2014-08-18 20:25:57 +02:00
Laurent Destailleur
50eb2e2c15 Fix: backlink was wrong after deleting product or service. 2014-08-18 18:24:57 +02:00
Regis Houssin
967991f31a Fix: project builddoc trigger is used now 2014-08-18 08:36:58 +02:00
Laurent Destailleur
741c093ac9 Merge pull request #1828 from atm-maxime/3.5 
Fix : VAT and NPR rates where coming from multiprice...
 2014-08-17 23:36:30 +02:00
Laurent Destailleur
f7e0ef74d7 Bad translation 2014-08-17 20:05:48 +02:00
Laurent Destailleur
4f206a2125 Fix: Missing empty field 2014-08-17 19:27:25 +02:00
Laurent Destailleur
d5eb4510e2 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-08-17 17:59:30 +02:00
Laurent Destailleur
dd9a08120f Fix: no ' on command to create user on pgsql 2014-08-17 17:13:00 +02:00
Regis Houssin
0632cbdad0 Fix: broken feature: add param for use only "disabled" with delConstant 
and "enabled" with setConstant
 2014-08-17 15:15:52 +02:00
Regis Houssin
86f1d59e3c Fix: broken feature: add param for use only "disabled" with delConstant 
and "enabled" with setConstant
 2014-08-17 15:12:20 +02:00
Laurent Destailleur
e7a8de18bf Fix: Minimum size for captcha 2014-08-17 15:05:42 +02:00
Laurent Destailleur
b0ebaec0da Fix: Add more log and missing error message 2014-08-17 12:43:24 +02:00
Laurent Destailleur
3f8ec47e91 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	ChangeLog
 2014-08-16 17:37:37 +02:00
Laurent Destailleur
3336b5bdce Fix: [ bug #1553 ] Saving User displays setup removes menu 2014-08-16 17:35:19 +02:00
Laurent Destailleur
f0c9513fa9 Fix: [ bug #1558 ] Product/service edit page title shows new Ref instead 
of old ref
 2014-08-16 17:18:53 +02:00
Laurent Destailleur
6b6b372579 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/theme/eldy/graph-color.php
 2014-08-15 02:28:16 +02:00
Regis Houssin
a8668aee11 Fix: add global object to test condition with an object 2014-08-14 15:35:08 +02:00
Regis Houssin
d4a0c122be Fix: add global object to test condition with an object 2014-08-14 15:33:41 +02:00
Maxime Kohlhaas
e760201a59 Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5 2014-08-14 14:26:01 +02:00
Maxime Kohlhaas
c6637207f8 Fix : VAT and NPR rates where coming from multiprice... 2014-08-14 14:25:41 +02:00
Raphaël Doursenaud
739d309a0d Updated category fix 
Categories ID can be passed as strings
PSR code formatting
 2014-08-14 08:46:51 +02:00
Cedric
8670a89ecb Fix #1544: Can remove date from invoice 2014-08-14 08:41:24 +02:00
Raphaël Doursenaud
1a9e98cda9 Fix categories bug 
When using the string type,
$typeid == 1 matched all strings making other conditions ineffective.
 2014-08-14 08:33:39 +02:00
Laurent Destailleur
91900f54c2 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-08-14 01:54:23 +02:00
Laurent Destailleur
387c123229 Fix: List of colors was too low. 2014-08-14 01:53:54 +02:00
Laurent Destailleur
3729178173 Merge pull request #1819 from FHenry/3.6 
Fix bug in output extrafields sell list
 2014-08-13 23:51:35 +02:00
Laurent Destailleur
230dd3d4eb Merge pull request #1824 from FHenry/3.5 
Fix: Missing include files.lib.php in some pages to use dol_delete_recursive
 2014-08-13 23:41:04 +02:00
Laurent Destailleur
6c316d0cda Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-13 19:23:45 +02:00
Laurent Destailleur
bcc0f244f0 Fix: Used wrong image 2014-08-13 19:21:31 +02:00
Laurent Destailleur
5026320fec Fix: Longueur zone texte libre incorrecte. 2014-08-13 14:44:41 +02:00
Laurent Destailleur
b2638625c9 Add comment to warn about a bug 2014-08-13 14:36:40 +02:00
Florian HENRY
329c0b2913 Fix: Missing include files.lib.php in some pages ti use 
dol_delete_recursive
 2014-08-13 12:42:55 +02:00
astebert
9c7647a7ae Update bills.lang 
Ligne 252 : Changement grammatical
- de "Paiements issue de l'acompte"
- en "Paiement issu de l'acompte"
 2014-08-12 11:45:11 +02:00
Laurent Destailleur
723bad0ece Fix: colspan 2014-08-11 18:22:00 +02:00
Laurent Destailleur
bb355ec7bd Fix: Do not force size. Must be done by function or css. 2014-08-11 18:06:23 +02:00
Laurent Destailleur
8630f397bc Fix: Do not force size. Must be done by function or css. 2014-08-11 18:02:17 +02:00
Florian HENRY
aabbc331a4 Fix output extrafield selllist 2014-08-11 13:12:04 +02:00
Florian HENRY
6849f713b5 Fix bug in output extrafields sell list 2014-08-11 13:09:35 +02:00
Laurent Destailleur
4d9c72f944 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-08-11 10:50:36 +02:00
Laurent Destailleur
8205a0e1b5 Fix: Better comment and var name 2014-08-11 10:50:08 +02:00
Laurent Destailleur
2c1db4cdd2 Revert "Update facture.php foreach wrong argument" 
This reverts commit bc0c0eeddb.
 2014-08-10 20:36:56 +02:00
Laurent Destailleur
bd29d3c7f4 Sync from transifex 2014-08-08 14:38:20 +02:00
Laurent Destailleur
d801bcc690 Fix: When jmobile is forced, we force enable of javascript. 2014-08-08 14:37:51 +02:00
Laurent Destailleur
8fe2f21c28 Merge pull request #1806 from atm-maxime/3.5 
Fix : warning was not calculated on the right date
 2014-08-08 01:52:57 +02:00
Laurent Destailleur
bceb72a9d1 Fix: Missing line total 2014-08-08 01:21:57 +02:00
Laurent Destailleur
91aabbb40e Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/lib/project.lib.php
	htdocs/main.inc.php
 2014-08-08 01:19:03 +02:00
Laurent Destailleur
9e8a8b4da5 Fix: regex syntax 2014-08-08 01:18:20 +02:00
Laurent Destailleur
c52794ce7f Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/projet/class/project.class.php
 2014-08-08 01:09:46 +02:00
Laurent Destailleur
e8ffb0dacf Fix: sql error on editing project with pgsql. 
Fix: Error management on project edit.
 2014-08-08 01:02:59 +02:00
Laurent Destailleur
159d0c7057 Fix: get_full_tree was not working correctly. 2014-08-07 20:21:16 +02:00
Laurent Destailleur
69888aa569 Fix: get_full_tree was not working correctly. 2014-08-07 20:13:19 +02:00
Laurent Destailleur
de76fe4951 Fix: Missing join into request. 
Conflicts:
	htdocs/compta/facture.php
 2014-08-07 15:05:31 +02:00
Laurent Destailleur
1239e713c9 Fix: Missing join into request. 2014-08-07 15:00:10 +02:00
Laurent Destailleur
8c728ac638 Fix: bad regex syntax 2014-08-07 12:47:14 +02:00
Maxime Kohlhaas
1caf39ad22 Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5 2014-08-07 12:26:18 +02:00
Laurent Destailleur
d0c3a7913f Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.
 2014-08-07 12:15:18 +02:00
Laurent Destailleur
48fc945648 Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.

Conflicts:
	htdocs/core/lib/project.lib.php
	htdocs/projet/activity/list.php
 2014-08-07 12:13:00 +02:00
Laurent Destailleur
a49bce10de Fix: When disabled, all fields must be disabled. Need backport. 
Conflicts:
	htdocs/projet/activity/list.php
 2014-08-07 12:09:28 +02:00
Laurent Destailleur
1e473839e7 Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.
 2014-08-07 12:06:16 +02:00
Laurent Destailleur
1016e05fc6 Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.
 2014-08-07 11:50:34 +02:00
Laurent Destailleur
ebc11a7a9c Fix: When disabled, all fields must be disabled. Need backport. 2014-08-07 11:50:25 +02:00
Laurent Destailleur
20cef1512f Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-06 21:34:47 +02:00
Laurent Destailleur
d694b10274 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-08-06 17:15:50 +02:00
Laurent Destailleur
98eb39bf9c Fix: PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS is correctly supported 2014-08-06 16:46:04 +02:00
Maxime Kohlhaas
546b31b9d0 Fix : Filtering on fourn paiement list was not working 2014-08-06 12:02:44 +02:00
Maxime Kohlhaas
27266ba7e1 Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5 2014-08-06 11:53:56 +02:00
Laurent Destailleur
c781bb4d08 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/holiday/fiche.php
 2014-08-06 09:12:29 +02:00
Laurent Destailleur
85748711b5 Fix: Table holiday_user was not initialized anymore. 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
 2014-08-06 09:08:28 +02:00
Maxime Kohlhaas
3499c69b7d Fix : search contact by phone was mistaking phone pro and phone perso 2014-08-06 08:54:22 +02:00
Laurent Destailleur
8f73c7a82a Fix: Remove debug 2014-08-06 01:49:22 +02:00
Laurent Destailleur
9b9e51d50f Fix: removed debug 2014-08-06 01:48:51 +02:00
Laurent Destailleur
277bfc8012 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-06 01:46:57 +02:00
Laurent Destailleur
168f71ac18 Fix: Log of leaves was broken on some mysql versions. 2014-08-06 01:45:58 +02:00
Laurent Destailleur
273b9029b8 Fix: mb_strtolower function does not exists on all PHP versions. 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2014-08-06 01:45:31 +02:00
Laurent Destailleur
f33df3419c Fix: mb_strtolower function does not exists on all PHP versions. 2014-08-05 21:25:47 +02:00
Laurent Destailleur
3a4a1a4c72 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-08-05 18:28:52 +02:00
Laurent Destailleur
5027222c33 Fix: When there is an error to update a thirdparty, the number for 
supplier and customer code is kept to old value.
 2014-08-05 18:28:06 +02:00
Laurent Destailleur
ee3f92a168 Fix: When there is an error to update a thirdparty, the number for 
supplier and customer code is kept to old value.
 2014-08-05 18:22:01 +02:00
Maxime Kohlhaas
269a59e11a Fix : warning was not calculated on the right date 2014-08-05 14:17:29 +02:00
Laurent Destailleur
76353bf427 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture/impayees.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
 2014-08-04 22:18:30 +02:00
Laurent Destailleur
6a61587085 Try a fix when timezone string is not standard 
Conflicts:
	htdocs/includes/adodbtime/adodb-time.inc.php
 2014-08-04 12:49:54 +02:00
Laurent Destailleur
863d57004e Fix: Field must be invisible 2014-08-04 10:44:19 +02:00
Laurent Destailleur
c7d4b1e3d5 Merge pull request #1802 from FHenry/3.6 
Fix extrafield parameters for sellist
 2014-08-04 09:13:42 +02:00
Laurent Destailleur
d14fcf617c Merge pull request #1799 from FHenry/3.5 
Fix : Fusion PDF button on unpaid invoice is no more displayed
 2014-08-04 09:08:47 +02:00
Laurent Destailleur
e56956110f Merge pull request #1796 from atm-maxime/3.5 
Fix : shipping list SQL request was not filtering on shipping element
 2014-08-04 08:58:41 +02:00
Laurent Destailleur
b5bb4c639c Fix: Clean data 2014-08-04 00:15:23 +02:00
Laurent Destailleur
0834178bf5 Add more colors to fix pb with agenda 2014-08-04 00:15:08 +02:00
Laurent Destailleur
bf7a33494e Run request to clean data 2014-08-03 23:55:33 +02:00
Laurent Destailleur
86b2887d44 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-03 23:54:05 +02:00
Laurent Destailleur
b16dc8dbcd Fix: Tab not selected 2014-08-03 23:51:26 +02:00
Laurent Destailleur
8ea52f52f5 Fix: Missing counter into document tab 2014-08-03 23:48:27 +02:00
Laurent Destailleur
51f1577c84 Fix: Field for user into event is "owner". 2014-08-03 23:32:36 +02:00
Laurent Destailleur
9fb11cd13b Fix: Action created by triggers does not saved owner of action. 2014-08-03 23:20:32 +02:00
Laurent Destailleur
4c91788941 Fix: Can not set option when using in nojs mode. 2014-08-03 22:08:25 +02:00
Laurent Destailleur
6ff57e57c2 Fix: external link is visible when a module is using tabhelp of 
dictionary.
 2014-08-02 00:34:54 +02:00
Juanjo Menent
c15da5f257 Fix: Price by customer: a client must be able to have multiple products 
with customer prices
 2014-08-01 18:22:39 +02:00
Laurent Destailleur
41f846ac6e Fix: Bad param 2014-08-01 17:13:23 +02:00
Florian HENRY
b0011d0514 remove debug 2014-08-01 16:50:47 +02:00
Florian HENRY
767ca07374 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-08-01 16:48:59 +02:00
Florian HENRY
17e272c8ac Fix extrafield parameters for sellist 2014-08-01 16:48:16 +02:00
Florian HENRY
44f06bef22 Unpaid invoice launch fusion PDF action even if it is only search (with 
enter keyboard input instead of lens click)
 2014-08-01 15:21:29 +02:00
Florian HENRY
139dfa5b80 Fix : Fusion PDF button on unpaid invoice is no more displayed 2014-08-01 15:05:43 +02:00
Laurent Destailleur
c6d491b0b9 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-08-01 14:49:24 +02:00
Laurent Destailleur
07cf09536d Fix: delete bank account 2014-08-01 14:48:48 +02:00
Juanjo Menent
32e110b6d9 Fix: Price by customer 2014-08-01 13:25:29 +02:00
Maxime Kohlhaas
23974daca4 Fix : shipping list SQL request was not filtering on shipping element 2014-08-01 09:57:08 +02:00
Laurent Destailleur
33a60bc14e Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-08-01 02:02:14 +02:00
Laurent Destailleur
80e8ff8db3 Sync from transifex 2014-08-01 02:01:51 +02:00
Regis Houssin
977300c653 Fix: missing skin.js 2014-07-31 11:15:30 +02:00
BENKE Charles
fb4e64fdab Update consumption.php 
security access fix : we don't have right to access of invoice and order if we are not agreed
 2014-07-29 11:28:46 +02:00
Laurent Destailleur
c9d27383a4 Fix: When option to use optimize display for text borwser and blin 
person is on, box addon was broken.
 2014-07-29 00:50:57 +02:00
Laurent Destailleur
096a61d5c0 Fix: [ bug #1542 ] extrafields.class.php, showOutputField wrong 
translate.
 2014-07-28 20:35:32 +02:00
Laurent Destailleur
21c7972f7e Fix: [ bug #1541 ] Surveys menu is not shown up if Export/Import module 
is not enabled.
 2014-07-28 20:34:51 +02:00
Laurent Destailleur
6d7b50d5d4 Fix: [ bug #1541 ] Surveys menu is not shown up if Export/Import module 
is not enabled.
 2014-07-28 20:34:42 +02:00
Laurent Destailleur
1a96bc0f30 Fix: Bad url for cron 
Fix: must use html syntax, not xml
 2014-07-28 20:33:37 +02:00
Laurent Destailleur
0ca72dcfea Fix: Restore compatibility with old modules. 2014-07-27 23:53:46 +02:00
Laurent Destailleur
41ab5a0ce2 Fix: date was not saved if not in future. 2014-07-26 19:02:32 +02:00
Laurent Destailleur
db091896a5 Prepare 3.6. 
Use google adsense tag of foundation for doxygen doc pages.

Version is no more encoded int odoxygen.

Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture/impayees.php
	htdocs/filefunc.inc.php
 2014-07-26 18:10:51 +02:00
Laurent Destailleur
adb70ecf24 Fix: [ bug #1528 ] Leopard Services numeration module description is not 
translated.
 2014-07-26 17:40:07 +02:00
Laurent Destailleur
f794b820c3 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-07-26 17:30:41 +02:00
Laurent Destailleur
a8547e9c4d Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne 
s'appliquent pas
 2014-07-26 17:30:10 +02:00
Laurent Destailleur
45435b597e Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne 
s'appliquent pas
 2014-07-26 17:18:19 +02:00
Maxime Kohlhaas
36b634784b Fix : real delivery date on livraison was not displayed 2014-07-25 16:31:41 +02:00
Maxime Kohlhaas
386022947a Categorie class was fetching an object even if no param passed 2014-07-25 14:11:31 +02:00
Maxime Kohlhaas
2e18fa88d1 Mauvais libellé utilisé pour statut commande 2014-07-25 14:03:41 +02:00
Juanjo Menent
8cd2e00e5f Fix: [ bug #1521 ] The second order's page from a provider shows all 
orders
 2014-07-21 16:57:08 +02:00
Laurent Destailleur
8d46b02d67 Fix: missing property 2014-07-20 15:58:05 +02:00
Laurent Destailleur
3451276b8b Merge pull request #1755 from marcosgdf/translation-taxes 
Corrected VAT expenses behaviour name
 2014-07-20 04:56:02 +02:00
Laurent Destailleur
c289e8a23d Merge pull request #1754 from ndrosis/patch-3 
Fix Link product, In list view and label product
 2014-07-20 04:54:48 +02:00
Laurent Destailleur
6499c4ff70 Merge pull request #1750 from nicoplh/patch-1 
Update impayees.php
 2014-07-20 04:45:47 +02:00
Laurent Destailleur
a74b65df0e Fix: Add max height to solve pb with very large logo. 2014-07-20 04:29:47 +02:00
Laurent Destailleur
8137fd7fe4 Fix: Type of line (product/service) could not be edited on supplier 
order/invoice.
 2014-07-20 02:36:03 +02:00
Laurent Destailleur
a9779ca1ff Fix: bad colspan for line with date selector 2014-07-20 02:18:21 +02:00
Laurent Destailleur
109ccf9b74 Fix: SQL syntax error with pgsql 
Conflicts:
	htdocs/contrat/class/contrat.class.php
 2014-07-19 22:40:53 +02:00
Laurent Destailleur
6637ea51e3 Fix: [ bug #1534 ] Unknown error when deleting a product photo under 
special circumstances
 2014-07-19 16:41:14 +02:00
Laurent Destailleur
7a8f244ae9 Fix: Translation 2014-07-19 16:03:55 +02:00
Marcos García de La Fuente
7794101e10 Corrected VAT expenses behaviour name 2014-07-19 05:36:29 +02:00
Laurent Destailleur
dbae31b982 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-07-18 20:17:18 +02:00
Laurent Destailleur
e94ffceac9 Transifex sync for 3.6 2014-07-18 20:16:46 +02:00
Laurent Destailleur
44e57ca08a Fix: Seach on company was not working 2014-07-18 18:21:09 +02:00
nicoplh
2cfc5f10a8 Update impayees.php 
remove useless type alpha.
 2014-07-18 14:47:23 +02:00
Drosis Nikos
4f0d01d5c5 Fix Link product, In list view and label product 
This Fix added and develop.
 2014-07-18 14:36:46 +03:00
nicoplh
25a591bd03 Update impayees.php 
Add column ref.Client with search module.
 2014-07-17 16:21:23 +02:00
Cedric
f38ab46928 correction typo 2014-07-15 19:02:43 +02:00
Cedric
769c9a9b66 FIX stock inconsistency when activating batch management on product which already have stock 2014-07-15 11:22:16 +02:00
Laurent Destailleur
9acf60d7c5 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	.travis.yml
	ChangeLog
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/class/html.formfile.class.php
 2014-07-14 23:36:10 +02:00
Laurent Destailleur
32a6d59b64 Merge pull request #1734 from FHenry/3.5 
Fix
 2014-07-14 23:13:03 +02:00
Laurent Destailleur
f55814e3b2 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-07-14 23:11:33 +02:00
Laurent Destailleur
0bfc90ee9a Merge pull request #1744 from marcosgdf/bug-linkedprojects 
Fixed a bug introduced in commit 0916d2cf3b
 2014-07-14 23:05:16 +02:00
Juanjo Menent
2ac088d60e Merge pull request #1739 from KreizIT/XssFix 
Security fix
 2014-07-14 19:58:48 +02:00
Juanjo Menent
f8b5bac05c Fix: Import ProfId1 to siren and ProfId2 to siret 2014-07-14 19:40:18 +02:00
Juanjo Menent
3930c8829e Fix: Import ProfId1 to siren and ProfId2 to siret 2014-07-14 19:38:00 +02:00
Marcos García de La Fuente
b0ae2fe2aa Fixed a bug introduced in commit 0916d2cf3b 2014-07-14 01:32:57 +02:00
Marcos García de La Fuente
4bc8e026b6 [ bug #1526 ] Thumbs of files uploaded with dots in their names do not load correctly 2014-07-13 19:51:44 +02:00
Cedric
d289306fa4 Security fix 2014-07-12 16:22:49 +02:00
Florian HENRY
b9df48d48c Fix 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50854-multi-societe-options-cookies
 2014-07-11 15:53:31 +02:00
Laurent Destailleur
0cba9b8fae Merge pull request #1726 from atm-alexis/3.5 
FIX : Bad rank when a bill was made by multiple orders
 2014-07-11 12:25:50 +02:00
Florian HENRY
3f23b116c6 [ bug #1522 ] Liste des propositions commerciales non filtée depuis un 
projet
 2014-07-11 11:44:54 +02:00
Laurent Destailleur
32c15132df Fix: sql syntax error 2014-07-08 23:19:46 +02:00
Laurent Destailleur
f0056b3b95 Fix: Migration does not match tables 2014-07-08 22:40:06 +02:00
Laurent Destailleur
a137b31a47 Fix: ON DELETE CASCADE is forbidden. 
Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	test/phpunit/SqlTest.php
 2014-07-08 21:50:29 +02:00
Laurent Destailleur
f1d1736532 Fix: checkstyle 2014-07-08 20:59:14 +02:00
Laurent Destailleur
0e78e631c1 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	.travis.yml
 2014-07-08 20:22:51 +02:00
Alexis Algoud
6d83882a5d FIX : Bad rank when a bill was made by multiple orders 2014-07-08 09:00:41 +02:00
Laurent Destailleur
0eabf26d27 Fix: Checkstyle 2014-07-08 01:15:59 +02:00
Laurent Destailleur
36e6f9a9fc Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	.travis.yml
 2014-07-08 01:06:17 +02:00
Laurent Destailleur
41dc0681c6 Merge pull request #1715 from defrance69/patch-5 
getlibstatut added
 2014-07-08 00:31:07 +02:00
Laurent Destailleur
7c16322391 Merge pull request #1713 from FHenry/3.6 
Remove fetch_optionnal becauwe done in fetch from product class
 2014-07-07 21:25:53 +02:00
Laurent Destailleur
96ec3ad7f4 Fix: Allow percent to solve presentation pb by some pages. 2014-07-07 00:14:24 +02:00
Laurent Destailleur
56c067f15c Fix: form is not allowed inside a table 
Conflicts:
	htdocs/fichinter/fiche.php
 2014-07-06 21:16:27 +02:00
BENKE Charles
4d9f78dc07 getlibstatut added 
Add function getlibstatut and libstatut on task (fk_statut allready present on project_task table)
 2014-07-06 15:06:34 +02:00
Florian HENRY
cb9e0983dd Remove fetch_optionnal becauwe done in fetch from product class 2014-07-06 10:24:01 +02:00
Florian HENRY
fe50d8b1ab restore min jquery 2014-07-05 11:19:49 +02:00
Florian HENRY
02574a7af2 Fix Ajax combobox in Extrafeilds 
Add Extrafield on contract
 2014-07-05 11:17:50 +02:00
Florian HENRY
13c208dd8f Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-07-05 10:28:58 +02:00
Laurent Destailleur
faa5eba203 Fix: Substitution for external module at wrong place. 2014-07-04 18:43:37 +02:00
Florian HENRY
b8c293fb16 $dateSelector is a paramters of formAddObjectLine, if use global it is 
reset to 0 because not declare in outer context but already exists in
the same context.
 2014-07-04 14:48:27 +02:00
Florian HENRY
cdfe8818da avoid message 
Delimiter must not be alphanumeric or backslash in
/home/bobby/Eclipse/workspace/dolibarr/htdocs/main.inc.php on line 450
on preg_replace
 2014-07-04 13:16:48 +02:00
Laurent Destailleur
7d519fdfe6 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-07-04 13:08:50 +02:00
Laurent Destailleur
bf96a78f63 Try a fix when timezone string is not standard 2014-07-04 13:07:53 +02:00
Laurent Destailleur
c662f34f16 Merge pull request #1702 from atm-maxime/3.6 
Fix : virtual stock was not correctly calculated because reception was n...
 2014-07-04 12:29:37 +02:00
Laurent Destailleur
7ee1388582 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-07-04 12:22:10 +02:00
Laurent Destailleur
f22a04810e Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-07-04 11:59:01 +02:00
Laurent Destailleur
11abba30b3 Fix: Add information to help debug pb with TZ. 2014-07-04 11:58:41 +02:00
Juanjo Menent
47cff4d407 Fix: Unable to add lines in supplier orders 2014-07-04 10:04:30 +02:00
Maxime Kohlhaas
db0fa0afd0 Revert "Fix : ordered should display qty in supplier order not yet send" 
This reverts commit f2248d5bc8.
 2014-07-03 18:17:34 +02:00
Maxime Kohlhaas
8eb8f33f28 Ajout qté dans écran consommation produit 2014-07-03 18:14:26 +02:00
Maxime Kohlhaas
f2248d5bc8 Fix : ordered should display qty in supplier order not yet send 2014-07-03 17:57:36 +02:00
Maxime Kohlhaas
51e4fa0d36 Fix : picto for already ordered product was missing 2014-07-03 15:31:51 +02:00
Maxime Kohlhaas
a26db9ab52 Fix : qty ordered was not including qty already received 2014-07-03 14:47:28 +02:00
Maxime Kohlhaas
a22963e432 Fix : filter by status + was not working if desiredstock not defined 2014-07-03 14:37:30 +02:00
Maxime Kohlhaas
830cc30f80 Fix : sendings and reception stock calculation must be on the same status than order and oreder supplier calculation 2014-07-03 12:31:55 +02:00
Maxime Kohlhaas
b115e9b943 Fix : replenish function was not working with virtual stock 2014-07-03 12:07:34 +02:00
Maxime Kohlhaas
959c41e8db Fix : virtual stock was not correctly calculated because reception was not included. 2014-07-03 10:24:29 +02:00
Laurent Destailleur
de527365a8 Fix: [ bug #1517 ] Packages sizes 2014-07-02 20:10:44 +02:00
Laurent Destailleur
ea310efba5 Fix: [ bug #1471 ] Several PHP warnings when intercepting USER_CREATE 
trigger
 2014-07-02 19:57:18 +02:00
Laurent Destailleur
2537a9d35f Fix: Error if module multicompany was removed without being disabled. 2014-07-02 19:44:25 +02:00
Laurent Destailleur
c2f0d84e45 Fix: [ bug #1512 ] Manque des produits dans la page réapprovisionement 2014-07-02 19:35:02 +02:00
Marcos García de La Fuente
b70a090de2 Corrected English typo 2014-07-02 19:10:17 +02:00
Laurent Destailleur
57b546650a Fix: Hide title of event when agenda module disabled. 2014-06-30 19:03:52 +02:00
Laurent Destailleur
14de1d66c0 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-06-29 23:56:23 +02:00
Laurent Destailleur
02f4016b7b Merge pull request #1693 from aspangaro/3.6 
Fix :: acount_parent must be an int - Final step
 2014-06-29 23:46:49 +02:00
Laurent Destailleur
6fc3111216 Merge pull request #1691 from atm-maxime/3.6 
Fix : Invoice PDF was not showing ref when created from a shipment. Now ...
 2014-06-29 23:44:18 +02:00
Florian HENRY
e8bb5d5cc0 Syntax 2014-06-29 17:43:22 +02:00
Florian HENRY
1857280234 Fix [ bug #1516 ] PRODUIT_CUSTOMER_PRICES don't take default price if 
not defined for customer
 2014-06-29 17:39:54 +02:00
Laurent Destailleur
198a8d40f7 Fix: Missing translation 2014-06-29 13:53:07 +02:00
aspangaro
25f2fec473 Fix :: acount_parent must be an int - Final step 2014-06-29 07:02:13 +02:00
aspangaro
f6e307480f Merge branch 'Upstream/3.6' 2014-06-29 05:50:48 +02:00
Maxime Kohlhaas
d61e5bae93 Fix : Invoice PDF was not showing ref when created from a shipment. Now shows refs and dates of shipment and oreder related 2014-06-28 17:01:52 +02:00
Laurent Destailleur
dd1c5ce3d8 Fix: Missing commit 2014-06-28 15:03:11 +02:00
Laurent Destailleur
71ee974ddb Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-06-28 14:53:28 +02:00
Laurent Destailleur
ef8b555750 Fix: When using option MAIN_MAIL_ALLOW_SENDMAIL_F, a mail was sent to 
sender.
 2014-06-28 14:48:00 +02:00
Laurent Destailleur
d903db6a18 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-06-28 01:54:20 +02:00
Laurent Destailleur
18838ccfa0 Fix: Correct name for thirdparty created from member. 2014-06-28 01:53:56 +02:00
Laurent Destailleur
092d1b725d Merge pull request #1684 from KreizIT/triggers 
FIX #1460, #1461
 2014-06-26 22:59:55 +02:00
Laurent Destailleur
fc4493242a Merge pull request #1685 from KreizIT/3.6 
FIX : #1477, #1478, #1479
 2014-06-26 21:00:26 +02:00
Raphaël Doursenaud
f5980a1d20 Fix database prefix usage 2014-06-26 15:52:31 +02:00
Laurent Destailleur
2b93380ab0 Syn pt_BR from transifex 2014-06-26 01:51:17 +02:00
Laurent Destailleur
018e1d31e3 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/class/product.class.php
	htdocs/projet/class/project.class.php
 2014-06-25 20:22:25 +02:00
Laurent Destailleur
1e6e5da925 Fix: sql syntax error (missing ' on date) 2014-06-25 20:07:54 +02:00
Laurent Destailleur
018771c0f5 Fix: sql syntax error (missing ' on date) 2014-06-25 20:07:21 +02:00
Cedric
ee91f4a3f7 FIX : #1477, #1478, #1479 2014-06-25 13:37:55 +02:00
Laurent Destailleur
ffd27f2d49 Fix: Translation 
Fix: pgsql pb
 2014-06-25 08:52:57 +02:00
Laurent Destailleur
f64f0d6933 Fix: If showempty is 0 and empty, do not show button. 2014-06-24 23:43:53 +02:00
Laurent Destailleur
54f55cf03e Fix: No change if error on trigger 2014-06-24 22:14:45 +02:00
Laurent Destailleur
1db9514fed Fix: When an invoice is replaced with another, amount must not appears 
on total for project
 2014-06-24 22:02:56 +02:00
Cedric
e21e4dbf11 - FIX #1482 #1484 #1486 
- Add missing triggers in interface_90
 2014-06-24 11:49:53 +02:00
Cedric
0c382ef97e Remove failure test on trigger 2014-06-24 10:55:21 +02:00
Cedric
00779dd8fa FIX #1460, #1461 2014-06-24 10:53:18 +02:00
aspangaro
54a79c2b34 Merge branch 'Upstream/develop' 2014-06-24 05:48:40 +02:00
Laurent Destailleur
a94b78958f Merge pull request #1679 from defrance69/patch-1 
Update entrepot.class.php
 2014-06-23 20:28:53 +02:00
Laurent Destailleur
04ead87aea Merge pull request #1681 from KreizIT/FIX1485 
FIX #1485:LINEBILL_SUPPLIER_DELETE failure trigger leads to an endless
 2014-06-23 20:20:31 +02:00
Cedric
0f267559c6 FIX #1485:LINEBILL_SUPPLIER_DELETE failure trigger leads to an endless loop 2014-06-23 12:28:59 +02:00
Laurent Destailleur
b4add020a9 Fix: Question about warehouse must not be done when module stock is 
disabled.
Fix: Option STOCK_SUPPORTS_SERVICES was not correctly implemented
(missing test at some places).
 2014-06-23 11:47:07 +02:00
Laurent Destailleur
75d9e950c2 Fix: Another column visible when it shouldn't (field has been removed 
and is no more updated by dolibarr).
 2014-06-23 10:10:18 +02:00
Laurent Destailleur
dae7f8643b Transifex sync 2014-06-22 23:37:20 +02:00
BENKE Charles
13ce63ce99 replace mvid by $mvid, wrong week-end 2014-06-22 22:59:25 +02:00
Laurent Destailleur
c18d7de7b0 Fix: Use bad var for test 2014-06-22 13:33:31 +02:00
Laurent Destailleur
d22bfa8847 Fix: Cloning must use dol_clone 2014-06-21 18:16:22 +02:00
Laurent Destailleur
0778d38b2c Fix: Deprecated and no more used fields should not appear to user. 2014-06-21 18:08:32 +02:00
Laurent Destailleur
62b0d8a472 Fix: Deprecated and no more used fields should not appear to user. 2014-06-21 18:03:01 +02:00
BENKE Charles
3a886dfeb4 Update mouvementstock.class.php 
return mouvement id instead simply "1", i need to store the movement id on my factory modules (to update it at the end of the build process if it's need)
 2014-06-21 17:51:50 +02:00
BENKE Charles
60ac697813 Update main.inc.php 2014-06-21 16:10:13 +02:00
Laurent Destailleur
dce0c38533 Fix: Add hidden option so we can restore old behaviour (duration is 
free) for people that can't work with new one.
 2014-06-21 16:06:59 +02:00
Laurent Destailleur
d19b34cc7e Fix: Renaming a project with uplaoded files failed. 2014-06-21 15:45:53 +02:00
Laurent Destailleur
76532218c2 Fix: [ bug #1476 ] Invoice creation form loses invoice date when there 
is a validation error
 2014-06-21 15:35:30 +02:00
BENKE Charles
7d76458488 Update entrepot.class.php 2014-06-21 11:39:21 +02:00
BENKE Charles
51a2c2f5cb Update entrepot.class.php 
bad element name
 2014-06-21 10:43:47 +02:00
Laurent Destailleur
5c0813e865 Fix: EMail test feature to make a test without html must not include any 
html.
 2014-06-21 01:26:41 +02:00
Laurent Destailleur
69c518a483 Merge pull request #1677 from guerinaxel/patch-6 
LDAP Authentication faulty
 2014-06-20 17:14:02 +02:00
Laurent Destailleur
a72c3d4381 Merge branch 'develop' of github.com:atm-maxime/dolibarr into 
atm-maxime-develop

Conflicts:
	htdocs/core/class/html.formprojet.class.php
 2014-06-20 17:11:12 +02:00
guerinaxel
cc0d91bf2b LDAP Authentication faulty 
The LDAP Authentication only test the POST authentication however we're allowed to authenticate using the function (for example via WebServices).
 2014-06-20 17:00:06 +02:00
Laurent Destailleur
39eea995a4 Merge pull request #1675 from FHenry/3.5 
Fix == instaed of = in variable affectation
 2014-06-20 16:52:44 +02:00
Laurent Destailleur
2dc3e5b104 Fix: [ bug #1471 ] Several PHP warnings when intercepting USER_CREATE 
trigger (Add a protection to avoid multiple errors).
 2014-06-20 16:20:39 +02:00
Laurent Destailleur
a2724822d7 Fix: Add hidden option to partially fix a bug. A more complete fix 
should be done later.
 2014-06-20 16:01:08 +02:00
Laurent Destailleur
8d1fdec8cf Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/fiche.php
	htdocs/projet/fiche.php
 2014-06-20 15:26:02 +02:00
Laurent Destailleur
e2afa6853b Fix: Deletion of translation has disappeared. 2014-06-20 15:05:39 +02:00
Laurent Destailleur
e1a461b3d6 Fix: [ bug #1436 ] réapprovisionnement sur plusieurs pages 
Removed also strange image (no way to understand meaning).
 2014-06-20 14:34:13 +02:00
Laurent Destailleur
d0dffc8999 Fix: Duplicate column 2014-06-20 14:13:23 +02:00
Laurent Destailleur
28fd8c6862 Fix: [ bug #1431 ] Reception and Send supplier order box has a weird top 
margin.
 2014-06-20 14:04:37 +02:00
Maxime Kohlhaas
dd83a52fb1 Fix : project list was showing all projects instead of company project. This wasn't matching the function comments. 2014-06-20 13:59:50 +02:00
Laurent Destailleur
a2065d0b6a Fix: [ bug #1428 ] "Nothing" is shown in the middle of the screen in a 
supplier order.
 2014-06-20 13:49:59 +02:00
Laurent Destailleur
eb2f8bb733 Fix: [ bug #1427 ] erreur avec le bouton fiche suivante/précédente 2014-06-20 13:43:36 +02:00
Laurent Destailleur
fcb00b2024 Fix: [ bug #1425 ] 2014-06-20 13:38:44 +02:00
Florian HENRY
d09ccf5855 Fix == instaed of = in variable affectation 2014-06-20 13:21:49 +02:00
Laurent Destailleur
e7f08c6d37 Merge pull request #1674 from atm-maxime/3.5 
Fix 1462, 1468, 1480, 1483, 1490, 1497 $this instead of $object (3.5 fix...
 2014-06-20 13:20:50 +02:00
Laurent Destailleur
c903fe9340 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-06-20 13:20:07 +02:00
Laurent Destailleur
1cffc8d8f6 Merge branch '3.5' of github.com:fappels/dolibarr into fappels-3.5 2014-06-20 13:18:28 +02:00
Laurent Destailleur
6740e0321a Merge pull request #1670 from FHenry/3.5 
Fix [ bug #1349 ] AJAX contact selector does not work fine in Project
 2014-06-20 13:16:11 +02:00
Laurent Destailleur
51eb761b02 Merge pull request #1669 from aspangaro/develop-patch1 
Correction on 3.6beta
 2014-06-20 13:12:39 +02:00
Laurent Destailleur
8819f3e6e2 Merge pull request #1666 from atm-maxime/develop 
Fix : duedate was not auto calculated + move calculation function to com...
 2014-06-20 13:11:22 +02:00
Laurent Destailleur
3791175536 Fix: doxygen 2014-06-20 13:07:15 +02:00
Laurent Destailleur
221d7b56aa 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:52:08 +02:00
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
11ccd1af5f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-06-20 12:42:55 +02:00
Laurent Destailleur
4087781236 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.
 2014-06-20 12:41:23 +02:00
Laurent Destailleur
974025b5e1 Fix: Date format 2014-06-20 12:03:41 +02:00
Laurent Destailleur
d3c5e93399 Fix: Menu entries not visible 2014-06-20 12:01:14 +02:00
Maxime Kohlhaas
46e54ac64e Fix 1455 outstanding amount 2014-06-20 10:53:56 +02:00
Florian HENRY
40f5911f52 Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a 
product (on supplier order part)
 2014-06-20 09:36:31 +02:00
Maxime Kohlhaas
aaabf9647d Fix 1462, 1468, 1480, 1483, 1490, 1497 $this instead of $object (3.5 fix) 2014-06-20 09:33:25 +02:00
Maxime Kohlhaas
f2760f74ed Fix replenishment on virtual stock 2014-06-20 09:10:50 +02:00
Maxime Kohlhaas
bd21a559da Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-06-20 09:06:36 +02:00
Francis Appels
5b5473bc7c Fix: [ bug #1509 ] Expedition admin submit error 
Expedition admin free text & watermark submit error
 2014-06-19 10:02:58 +02:00
Florian HENRY
0645189432 If multiprice level is used the VAT on addline is not correct 2014-06-18 10:56:38 +02:00
Florian HENRY
03156b58e3 [ bug #1452 ] variable used but not defined 2014-06-17 11:30:41 +02:00
Florian HENRY
0f77fbaea2 Fix [ bug #1349 ] AJAX contact selector does not work fine in Project 
card
 2014-06-17 11:18:30 +02:00
Juanjo Menent
bb9862d6be Fix: When you add a right ended in 0, add all module rights 2014-06-17 10:15:53 +02:00
aspangaro
576978212e Merge branch 'Upstream/develop' 2014-06-17 06:48:25 +02:00
aspangaro
516363f491 Bank - Enhance readability 2014-06-17 06:43:50 +02:00
aspangaro
736561e8f0 Shop - Bad language file ("boutique" instead of "shop") & add language key 2014-06-17 06:31:20 +02:00
aspangaro
a974fa4a08 Merge branch 'Upstream/develop' 2014-06-17 06:30:12 +02:00
Laurent Destailleur
b70c695776 Fix: checkstyle 2014-06-16 18:41:28 +02:00
aspangaro
e469755d29 Divers 2014-06-16 06:17:46 +02:00
Maxime Kohlhaas
a3e278993e Fix 1455 outstanding amount 2014-06-14 23:34:19 +02:00
Laurent Destailleur
e6d407d418 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-06-14 14:21:10 +02:00
Laurent Destailleur
f0ce92292a Fix: date start/end of project was lost on some tabs. 
Fix: Bad file name for gantt include.
 2014-06-14 14:20:58 +02:00
Laurent Destailleur
4c0fe98ae2 Merge pull request #1665 from atm-maxime/develop 
Fix 1480, 1483, 1497 $this instead of $object
 2014-06-14 14:13:10 +02:00
Laurent Destailleur
e8bca38daf Fix: syntax error 2014-06-14 13:41:15 +02:00
Laurent Destailleur
7a70f8b513 Merge pull request #1663 from grandoc/develop 
Fix num paiement was not displayed
 2014-06-14 13:29:27 +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
8e5823ddc6 Merge pull request #1661 from KreizIT/develop 
FIX[ bug #1444 ] Shipment product batch is not proposed
 2014-06-14 13:26:19 +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
dd8fc8727d Merge pull request #1658 from frederic34/develop 
Display the total by currency account
 2014-06-14 13:04:52 +02:00
Laurent Destailleur
5cbf1ed3eb Merge pull request #1659 from fmarcet/develop 
Fix: When you remove a right with id ended in 0, removes all module rights
 2014-06-14 13:01:04 +02:00
Maxime Kohlhaas
19a3194b02 Fix : duedate was not auto calculated + move calculation function to common invoice class 2014-06-14 12:53:02 +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
cf948065f4 Fixes for bug 1449, 1450 and 1451 #1654 2014-06-14 12:30:48 +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
Maxime Kohlhaas
bada082b2b Fix 1462, 1468 $this instead of $object 2014-06-14 12:02:07 +02:00
Maxime Kohlhaas
1250804e81 Fix 1490 $this instead of $object 2014-06-14 11:42:17 +02:00
Maxime Kohlhaas
d0a417ad36 Fix 1480, 1483, 1497 $this instead of $object 2014-06-14 11:37:57 +02:00
frederic34
0cd4218986 Merge remote branch 'upstream/develop' into develop 2014-06-13 17:04:14 +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
18080deb93 Fix num paiement was not displayed 2014-06-13 12:16:49 +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
KreizIT
3c3bc8b769 FIX [ bug #1308 ] Stock movements on a product with batch 2014-06-12 16:29:03 +02:00
Laurent Destailleur
2edfcc2583 Fix: ref was not set on object after renamed 2014-06-12 15:56:38 +02:00
KreizIT
b090af9cca FIX[ bug #1444 ] Shipment product batch is not proposed 2014-06-12 15:43:40 +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
frederic34
88c5d6e5d1 Display the total with currency 2014-06-11 18:01:14 +02:00
fmarcet
56069baac8 Fix: When you remove a right ended in 0, removes all module rights 2014-06-11 17:51:50 +02:00
frederic34
89547dde37 Display the total by currency account 2014-06-11 17:42:03 +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
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
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
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
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
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
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
fmarcet
66606b42ca Fix: Serious bug on withdrawal 2014-06-06 17:06:30 +02:00
Laurent Destailleur
48cdd3c13f Fix: extra fields key. 2014-06-06 16:08:42 +02:00
Laurent Destailleur
2ec4c56f6b Merge pull request #1640 from FHenry/3.5 
3.5
 2014-06-06 15:34:57 +02:00
Laurent Destailleur
768163c6fc Fix: Easy fix to solve pb with pagebreak when adding image 2014-06-06 12:57:12 +02:00
Laurent Destailleur
171227e43a Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2014-06-06 12:00:21 +02:00
Laurent Destailleur
905f700136 Fix: Pb with pagebreak when adding image 2014-06-06 11:57:45 +02:00
Laurent Destailleur
c45aace9b9 Add easy fix to solve pb of links for some modules. 2014-06-05 23:30:20 +02:00
Laurent Destailleur
03ca7e6b63 Fix: Missing global 2014-06-05 22:42:49 +02:00
Florian HENRY
ebe49b0525 Same bug, missing select column use in result 2014-06-05 10:58:38 +02:00
Florian HENRY
e8f8644bf4 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-06-05 10:53:20 +02:00
Florian HENRY
44a1059158 Fix warining message during societe activation 2014-06-05 10:53:00 +02:00
Mainmich
bc0c0eeddb Update facture.php foreach wrong argument 
Wrong array in foreach line 503.
 2014-06-04 19:13:58 +02:00
Marcos García de La Fuente
4c11e37203 Fix: [ bug #1434 ] Muscadet supplier order document model linked objects overlap the text 2014-06-03 15:45:03 +02:00
aspangaro
bb4fed30a8 Salaries :: Missing key language & typo 2014-06-03 06:45:37 +02:00
Laurent Destailleur
fc2bd4ab4e Fix: [ bug #1380 ] Customer invoices are not grouped in company results 
report
(cherry picked from commit bd061f4)
 2014-06-02 02:16:49 +02:00
Laurent Destailleur
de10b16090 Fix: restore fa_IR integrity 2014-05-31 14:22:05 +02:00
Laurent Destailleur
883290a7b0 Add es_DO 2014-05-31 01:49:48 +02:00
aspangaro
27f0cbdb83 Merge branch 'Upstream/develop' 2014-05-30 21:01:01 +02:00
Laurent Destailleur
33d2e867dd Keep only delta for pt_BR 2014-05-30 18:26:33 +02:00
Laurent Destailleur
354ceddb87 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/contracts.lang
	htdocs/langs/es_ES/exports.lang
	htdocs/langs/es_ES/mails.lang
	htdocs/langs/es_ES/main.lang
	htdocs/langs/es_ES/products.lang
	htdocs/langs/es_ES/stocks.lang
 2014-05-30 18:17:52 +02:00
Juanjo Menent
8e3f36e9cc Trad: Update es_ES from transifex 2014-05-30 16:48:41 +02:00
Laurent Destailleur
d219916f0a Transifex sync 2014-05-30 16:47:24 +02:00
Laurent Destailleur
e1fc9bee6b Fix: Removed deprecated test 2014-05-30 13:41:58 +02:00
Laurent Destailleur
6b6261a803 Fix: Use last name and not name. 2014-05-30 13:34:51 +02:00
Laurent Destailleur
4a96fd0d77 Fix: No error once multicompany module has been removed. 2014-05-30 13:08:01 +02:00
Laurent Destailleur
efd9337c9f Fix: Hierarchy view with multicompany 2014-05-30 12:55:00 +02:00
Laurent Destailleur
449678d687 Fix: get_full_tree must follow same filter rule thant list of users 2014-05-30 12:43:07 +02:00
Laurent Destailleur
3c4dfba99e Fix: Filter on status 2014-05-30 12:32:19 +02:00
Laurent Destailleur
bc7621b92e Merge remote-tracking branch 'origin/3.5' into develop 2014-05-30 11:46:47 +02:00
Laurent Destailleur
584027dd05 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-30 11:46:34 +02:00
Laurent Destailleur
4060dfe8f2 Code comment to remind goal of field. 2014-05-30 11:46:16 +02:00
Laurent Destailleur
fb0f0047e7 Merge pull request #1633 from aspangaro/develop 
Typo / Missing key language / Fix limit list on mass movement stock page
 2014-05-30 11:33:08 +02:00
Laurent Destailleur
14d76d9229 Merge pull request #1632 from nicolasb827/patch-1 
Patch, missing product_type (or reset) on propal update line
 2014-05-30 11:31:36 +02:00
Laurent Destailleur
040f80b0f6 Merge pull request #1631 from FHenry/3.5 
Fix fiche fourn order and stuff visility according entity
 2014-05-30 11:30:18 +02:00
Laurent Destailleur
9a9b0824e7 Merge pull request #1629 from defrance69/patch-15 
Update fournisseur.facture.class.php
 2014-05-30 11:26:00 +02:00
Laurent Destailleur
e5bd170114 Add comment 2014-05-30 11:21:24 +02:00
aspangaro
aa4e9d5965 Merge branch 'Upstream/develop' 2014-05-29 21:44:03 +02:00
aspangaro
22bb789374 Chart of accounts BE PCMN-BASE - Account_parent must be an int. 2014-05-29 21:35:29 +02:00
Laurent Destailleur
82a2a723c3 Fix: [ bug #1419 ] Margins module shows margin of sold services even if 
services module is disabled
 2014-05-29 21:01:00 +02:00
Laurent Destailleur
882fc42ea1 Fix: 3.5 migration that was not complete. Second chance into 3.6. 2014-05-29 20:39:51 +02:00
Laurent Destailleur
b15c79845e Merge remote-tracking branch 'origin/3.5' into develop 2014-05-29 20:27:21 +02:00
Laurent Destailleur
67bd18f5cc Fix: [ bug #1406 ] Impossible de modifier une facture fournisseur 2014-05-29 20:25:41 +02:00
Laurent Destailleur
56d71f0da0 Fix: edit form 
Fix: pgsql driver
 2014-05-29 19:56:15 +02:00
Laurent Destailleur
b75dea98ee Fix: sql syntax 2014-05-29 19:46:32 +02:00
Laurent Destailleur
7a670c5bc7 Fix: pgsql driver not complete 
Conflicts:
	htdocs/core/db/pgsql.class.php
 2014-05-29 19:39:34 +02:00
Laurent Destailleur
e8ec0f524f Fix: pgsql driver not complete 2014-05-29 19:30:51 +02:00
Laurent Destailleur
ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
 2014-05-29 19:20:48 +02:00
Laurent Destailleur
f5a530e5d5 Fix: Bad permission. 
Fix: Bad transaction.
 2014-05-29 18:58:55 +02:00
Laurent Destailleur
1e2c452b95 Fix: If not choice at all we show all of them. 2014-05-29 18:11:14 +02:00
aspangaro
66d8b50159 Missing key language 2014-05-29 04:48:57 +02:00
Laurent Destailleur
1f8c35b70b Fix: security 2014-05-28 19:38:30 +02:00
aspangaro
a725a08c13 Fix :: List limit is not defined or based on limit product configuration 
Discussion http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50579-transfert-stock-pas-sur-tous-les-produits#51265
 2014-05-28 06:20:56 +02:00
aspangaro
b62fd30505 Missing key language 2014-05-28 06:17:28 +02:00
aspangaro
e856e64bc9 Typo 2014-05-28 06:17:09 +02:00
nicolasb827
c3ebece1ef fix update SQL request 2014-05-28 01:25:36 +02:00
nicolasb827
83aba41c6c copy type on line update 2014-05-28 01:18:31 +02:00
nicolasb827
c091009afb fetch product_type field from DB 
When loading propal line on edit, product_type is reset to 0
 2014-05-28 01:07:27 +02:00
Florian HENRY
32e3475700 Fix fiche fourn order and stuff visility according entity 2014-05-27 18:58:42 +02:00
BENKE Charles
4418a35e51 Update fournisseur.facture.class.php 
rowid not declared but used
 2014-05-27 15:17:59 +02:00
Laurent Destailleur
48bbcc6f4a Fix: Button was not be enabled. 2014-05-27 10:45:58 +02:00
Laurent Destailleur
33ef8595dc Fix: Bad alignement 2014-05-27 10:19:34 +02:00
Laurent Destailleur
8dad341ed4 Fix: css 2014-05-27 00:57:34 +02:00
Laurent Destailleur
072aca0bd6 License violation: Missing source on min file. 2014-05-27 00:26:53 +02:00
Laurent Destailleur
1557d8973f Fix: [ bug #1403 ] suppression d'une fiche produit impossible 2014-05-26 23:12:47 +02:00
Laurent Destailleur
51b6be4a64 Fix: If user has no perm to see other user, see himself. 2014-05-26 17:33:19 +02:00
Laurent Destailleur
7bd46d8aee Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-26 17:28:00 +02:00
Laurent Destailleur
1199d54fb2 Fix: When user has no permissions to see all other user, we must keep 
only user.
 2014-05-26 17:21:48 +02:00
Laurent Destailleur
45161172e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-26 16:52:24 +02:00
Laurent Destailleur
4880aac45f Fix: Regression 2014-05-26 15:24:01 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +02:00
Raphaël Doursenaud
12fed4f4d7 Fix: CRLF 2014-05-26 12:32:33 +02:00
Laurent Destailleur
2c4a152823 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-26 09:11:08 +02:00
Laurent Destailleur
93f1392e87 Fix: Bugs reported by scrutinizer 2014-05-26 09:07:18 +02:00
Laurent Destailleur
d41f87acab Fix: Option to limit was not used everywhere. 2014-05-26 01:27:22 +02:00
Laurent Destailleur
859b1cac4f Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-26 01:14:35 +02:00
Laurent Destailleur
5d9ec6807c Fix: Show duration only if defined. 2014-05-26 01:14:15 +02:00
Laurent Destailleur
4b9d1b901b Fix: [ bug #1401 ] Problème avec la génération des codes barres 2014-05-25 17:14:33 +02:00
Laurent Destailleur
4076a4a643 Fix: select_date accepts -1, '' or a date but not '0' 2014-05-25 14:51:56 +02:00
Laurent Destailleur
8e7b310fb6 Fix: [ bug #1400 ] Silent Warning create a draft invoice 2014-05-25 05:01:14 +02:00
Laurent Destailleur
1690da2369 Fix: Bad balance of td 2014-05-25 04:34:04 +02:00
Laurent Destailleur
44ecd504bc Fix: Field ref_supplier and label not filled. Just add FIXME because fix 
is too heavy for a maintenance release.
 2014-05-25 04:12:08 +02:00
Laurent Destailleur
ae01c785c5 Fix: Do not show ref supplier title if ref_supplier not set (currently 
always the case with 3.5).
 2014-05-25 03:57:13 +02:00
Laurent Destailleur
9bc1a6b4f5 Fix: favicon must use dol_buildpath and not hardcoded path 
Conflicts:
	htdocs/core/lib/security2.lib.php
 2014-05-24 18:29:22 +02:00
Laurent Destailleur
44ebaf45cf Fix: favicon must use dol_buildpath and not hardcoded path 2014-05-24 18:21:05 +02:00
Laurent Destailleur
e6f828cd86 Link to Preferred Partners missing. 2014-05-24 17:00:49 +02:00
Laurent Destailleur
a51e18a5a7 Fix: $error var must use type int and be increased when error found. 
Using $error as boolean at some place was source of error.
 2014-05-24 15:20:26 +02:00
Laurent Destailleur
872e764c94 Fix: html detection was not working with hx tags. 2014-05-24 14:57:41 +02:00
Laurent Destailleur
2a6b2a4540 Fix: Stat page show no cache when there is, if user was using apc. 2014-05-24 14:00:58 +02:00
Laurent Destailleur
b11ef37c58 Fix: Bad balance of table 2014-05-24 12:59:44 +02:00
Laurent Destailleur
1df758320d Fix: the delivery date must not be set with date of proposal. 2014-05-24 12:55:39 +02:00
Laurent Destailleur
f34aadef3d Fix: css 2014-05-23 21:06:53 +02:00
Laurent Destailleur
23e951ff2a Fix: select_date accepts -1 or '' but not 0 2014-05-23 20:54:23 +02:00
Laurent Destailleur
a63d085181 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-23 20:22:40 +02:00
Laurent Destailleur
07bc933110 Merge branch 'bug-1405' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1405

Conflicts:
	ChangeLog
 2014-05-23 20:21:41 +02:00
Laurent Destailleur
649fdd72dc Merge pull request #1622 from marcosgdf/bug-1410 
Fix: [ bug #1410 ] Add customer order line asks for required Unit Price but doesn't interrupt the creation of the line
 2014-05-23 20:20:22 +02:00
Laurent Destailleur
2771c506e9 Merge branch 'bug-1407' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1407

Conflicts:
	ChangeLog
 2014-05-23 20:17:41 +02:00
Laurent Destailleur
d1ee20dd42 Merge branch 'bug-1411' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1411

Conflicts:
	ChangeLog
 2014-05-23 20:11:13 +02:00
Laurent Destailleur
dc94b6e1bf Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-23 20:08:43 +02:00
Laurent Destailleur
9c398b14c5 Merge branch 'bug-1397' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1397

Conflicts:
	ChangeLog
 2014-05-23 20:06:40 +02:00
Laurent Destailleur
20ec1e6ac8 Fix: Suppliers invoices must be visible if module supplier is on. 2014-05-23 19:55:40 +02:00
Laurent Destailleur
300e430024 Fix: If user already exists but permissions not set, it was not possible 
to install Dolibarr.
 2014-05-23 16:13:00 +02:00
Laurent Destailleur
95d8161dc1 Merge pull request #1623 from grandoc/3.5 
avoid warning in commande.class.php if extrafields is used
 2014-05-23 13:21:39 +02:00
Marcos García de La Fuente
fa733c8ba4 Fix: [ bug #1405 ] Rouget PDF expedition incorrect when two expeditions under the same commande 2014-05-23 11:42:14 +02:00
Philippe Grand
7acecadc79 avoid warning in commande.class.php if extrafields is used 
avoid warning in commande.class.php if extrafields is used
 2014-05-23 11:37:57 +02:00
Laurent Destailleur
2c05146778 Merge pull request #1621 from marcosgdf/bug-1388 
Fix: [ bug #1388 ] Wrong date when invoicing several orders
 2014-05-23 11:34:41 +02:00
Laurent Destailleur
43bf9ba890 Fix: Import of ical files was broken 
Fix: Can import of ical files from BlueMind.
 2014-05-23 04:28:57 +02:00
Marcos García de La Fuente
a705d4e333 Fix: [ bug #1410 ] Add customer order line asks for required Unit Price but doesn't interrupt the creation of the line 2014-05-23 03:00:46 +02:00
Marcos García de La Fuente
0d121de1a6 Fix: [ bug #1388 ] Wrong date when invoicing several orders 2014-05-23 02:48:24 +02:00
Marcos García de La Fuente
9cc74c36d2 Missing copyright info 2014-05-23 02:45:15 +02:00
Marcos García de La Fuente
77c09d887a Fix: [ bug #1407 ] Rouget pdf overlapped when using tracking number and public notes 2014-05-23 02:44:02 +02:00
aspangaro
22bd18486b Merge branch 'upstream/develop' 2014-05-23 02:25:41 +02:00
aspangaro
0a670092d5 Fix :: Account_parent must be an int - Step 1 2014-05-23 02:23:32 +02:00
Marcos García de La Fuente
b2f299f5e4 Fix: [ bug #1411 ] Unable to set an expedition note if invoices module is not enabled 2014-05-23 02:22:38 +02:00
Marcos García de La Fuente
603c28dcdd [ bug #1397 ] Filter by supplier orders with status Draft does not filter 2014-05-23 02:04:02 +02:00
Laurent Destailleur
e9ab84074e Clean: Add script to clean secondary language files 
Clean language files for de_AT (only delta compared to de_DE).
 2014-05-22 14:33:42 +02:00
Laurent Destailleur
3481884731 Fix: A project is linked to a thirdparty (may be a customer, a supplier 
or a prospect).
 2014-05-22 13:20:03 +02:00
Florian HENRY
2a16a562d9 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-05-22 12:51:55 +02:00
Florian HENRY
87b9d0412c Fix element page on project 2014-05-22 12:51:00 +02:00
Laurent Destailleur
3f96632e02 Fix: CRLF 2014-05-21 20:34:52 +02:00
Laurent Destailleur
94335b186e Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/propale/mod_propale_marbre.php
 2014-05-21 20:30:07 +02:00
Laurent Destailleur
4a7e9e4d0b Fix: CRLF 2014-05-21 19:54:40 +02:00
Laurent Destailleur
c82ff0a146 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-05-21 19:51:05 +02:00
Laurent Destailleur
b146dcad31 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-21 19:45:28 +02:00
Laurent Destailleur
366bd64c4f Fix: When number reach 9999 with default numbering module, next number 
will be 10000 instead of 0000 and error.
 2014-05-21 19:44:53 +02:00
Regis Houssin
b39627288e Fix: missing hookmanager global 2014-05-21 11:48:45 +02:00
Laurent Destailleur
753ef28168 Fix: Data are clean once registered into dictionnaries. 2014-05-20 16:08:05 +02:00
Laurent Destailleur
28de634a95 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-19 20:42:38 +02:00
Laurent Destailleur
08c4a5dac7 Fix: Typo 2014-05-19 20:42:14 +02:00
Florian HENRY
ff1eb983c8 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-19 16:22:19 +02:00
Florian HENRY
5a5c858578 [ bug #1399 ] [pgsql] Silent warning when setting a propal as 
"facturée" in propal.php
 2014-05-19 16:21:59 +02:00
Laurent Destailleur
544bd27700 Merge pull request #1611 from guerinaxel/patch-3 
Correcting log use for commonobject.class.php
 2014-05-19 16:12:20 +02:00
Laurent Destailleur
ff46adf284 Merge pull request #1607 from GPCsolutions/3.6b-review 
3.6b review
 2014-05-19 16:07:49 +02:00
Laurent Destailleur
56415400eb Merge pull request #1606 from FHenry/3.5 
escape for insert SQL expedition module
 2014-05-19 16:03:36 +02:00
guerinaxel
1dbcd215b8 Correcting log use for commonobject.class.php 
Correcting dol_syslog use which had 3 parameters instead of 2.
 2014-05-19 15:54:43 +02:00
Laurent Destailleur
e09cc127fd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-19 15:10:46 +02:00
Raphaël Doursenaud
00162cc93d Members: fixed typo 2014-05-19 14:38:26 +02:00
Raphaël Doursenaud
c83a0309b1 Barcode: fixed wrong menu 2014-05-19 14:38:26 +02:00
Raphaël Doursenaud
c3f05d1c1c Withdrawals: fixed bad translation key 2014-05-19 14:38:26 +02:00
Raphaël Doursenaud
3209483f1b Bank search: Better wording 2014-05-19 14:38:26 +02:00
Raphaël Doursenaud
400de35248 Products: missing translations 2014-05-19 14:38:18 +02:00
Raphaël Doursenaud
55e7862027 Added missing local communities links 2014-05-19 14:37:37 +02:00
Raphaël Doursenaud
13cb2e478f Contracts module configuration: missing translation string 2014-05-19 14:37:30 +02:00
Raphaël Doursenaud
fa1af990d2 Third party module configuration: cosmetic change 
Align the button on the right
 2014-05-19 14:33:39 +02:00
Raphaël Doursenaud
0fd994a687 Install: english comments 2014-05-19 14:33:39 +02:00
Raphaël Doursenaud
ba8676dc61 Install: unlimitted memory is ok 2014-05-19 14:33:39 +02:00
Laurent Destailleur
5709179cf0 Fix: Box was not added on correct side 2014-05-19 00:05:49 +02:00
Laurent Destailleur
39ce76ba1b Sync from transifex 2014-05-18 12:25:20 +02:00
Laurent Destailleur
b7f55ea99c Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/liste.php
 2014-05-18 11:52:52 +02:00
Laurent Destailleur
00dd7db75e Fix: Miscellaneous fixes into emailing target selectors (missing field 
name, missing translation, sql syntax error, missing fiels other)
 2014-05-17 19:43:22 +02:00
Laurent Destailleur
eec5d6d313 Fix: Error management of mass email feature 2014-05-17 19:02:47 +02:00
Florian HENRY
c2370f352b escape for insert SQL expedition module 2014-05-16 15:03:28 +02:00
Laurent Destailleur
ab337c7485 Merge pull request #1602 from atm-alexis/3.5 
FIX alert for customer order wasn't on delivery_date if exist
 2014-05-16 09:58:56 +02:00
Laurent Destailleur
5dffa919ce Merge pull request #1601 from atm-alexis/Shipping_you_cannot_change_the_size_of_the_package 
Add possibility to change package dimension after shipping creation
 2014-05-16 09:58:01 +02:00
Laurent Destailleur
add02b224e Merge pull request #1599 from FHenry/develop 
Add url column into llx_product into initdata for 3.6
 2014-05-16 09:55:04 +02:00
Marcos García de La Fuente
39b0ed7fc2 Fix: [ bug #1393 ] PHP Warning when creating a supplier invoice. 2014-05-14 22:47:19 +02:00
Alexis Algoud
fa212438c6 FIX alert for customer order wasn't on delivery_date if exist 2014-05-14 18:51:02 +02:00
Alexis Algoud
4e51963836 Add possibility to change package dimension after shipping creation 2014-05-14 17:20:11 +02:00
Florian HENRY
c57c7fdca6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-14 14:19:51 +02:00
guerinaxel
944e582c82 Missing include contrat.class.php 
Missing include for function calcul_price_total.
 2014-05-14 14:17:15 +02:00
Florian HENRY
26b74a53a2 Fix initdata 3.6 for CommandeFournisseurTest.php run correctly 2014-05-14 14:17:03 +02:00
Laurent Destailleur
fd271d7c92 Fix: Missing to set version to beta 2014-05-14 14:09:57 +02:00
Laurent Destailleur
f7d1e93136 Move module to status development 2014-05-14 12:27:09 +02:00
Laurent Destailleur
9ae9f062ac Checkstyle 2014-05-14 12:25:30 +02:00
Laurent Destailleur
15796ec592 Fix: checkstyle errors 2014-05-14 12:19:45 +02:00
Laurent Destailleur
0027dc30f5 Fix: Modules into core should never, by definition, activate hooks 
(hooks are architecture solution for external module)
 2014-05-14 12:14:18 +02:00
guerinaxel
4fc818d329 Correcting var name 
Correcting var name for contrat updateline
 2014-05-14 11:56:30 +02:00
Laurent Destailleur
97304fef21 Merge pull request #1598 from guerinaxel/patch-1 
Correcting var name
 2014-05-14 11:53:22 +02:00
Laurent Destailleur
525e41aa63 Merge pull request #1597 from defrance69/patch-10 
Update fiche.php
 2014-05-14 11:49:35 +02:00
Laurent Destailleur
6cebccf1b4 Merge pull request #1596 from marcosgdf/lang-35 
Corrected untranslated string when creating invoice linked to a supplier order
 2014-05-14 11:47:35 +02:00
Laurent Destailleur
b3b7da8f08 Merge pull request #1595 from FHenry/develop 
Add showempty into combobox
 2014-05-14 11:46:35 +02:00
Laurent Destailleur
4a347236ee Merge pull request #1594 from atm-alexis/develop 
Add detailled view in supplier order as in customer order
 2014-05-14 11:40:49 +02:00
Laurent Destailleur
d7d8eba6b1 Merge pull request #1592 from atm-alexis/3.5_adding_page_to_list_product_as_other_list 
Fix page numerotation for product, invoice and others as in company list
 2014-05-14 11:26:22 +02:00
Laurent Destailleur
757d92a318 Merge pull request #1589 from aternatik/resource_core 
Core integration of resource module
 2014-05-14 11:25:25 +02:00
Florian HENRY
eb8eca5f9d Suplier Order, do not insert line if error with missing fields 2014-05-14 10:55:27 +02:00
guerinaxel
e0a3e79dda Correcting var name 
Correcting var name for contrat updateline
 2014-05-14 10:23:03 +02:00
BENKE Charles
c528613620 Update fiche.php 
Adds the constant MAIN_USE_PROPAL_REFCLIENT_FOR_ORDER for those who need to use the ref_client of the propal in the order
 2014-05-14 09:46:49 +02:00
Marcos García de La Fuente
98bd78a277 Corrected untranslated string when creating invoice linked to a supplier order 2014-05-14 01:07:07 +02:00
Florian HENRY
fb277bbbab fix llx_societe.datea call in request 2014-05-13 19:32:04 +02:00
Florian HENRY
45c96e169f fix install 2014-05-13 19:17:50 +02:00
Florian HENRY
1f1a9e46fd Fix warning 2014-05-13 19:12:14 +02:00
Florian HENRY
a421d9f60f Fix notice pgsql method 2014-05-13 18:54:57 +02:00
Florian HENRY
8274b49fc1 Avoid notice during PGSQL installation 
$unescapeslashquot
 2014-05-13 18:50:35 +02:00
Laurent Destailleur
179583f79a More info into comment 2014-05-13 18:30:51 +02:00
Laurent Destailleur
9b38857c9a Fix: When creating an invoice, we must first create it as draft and then 
after validate.
 2014-05-13 14:24:27 +02:00
Laurent Destailleur
dd81cda210 Use 'auto' mode for all input done from user interface 2014-05-13 14:07:57 +02:00
Laurent Destailleur
7ecfd4c243 Fix: seller and buyer inverted when using suppliers orders and 
invoices.
 2014-05-13 13:55:08 +02:00
Laurent Destailleur
f621f7eb32 Fix: The rounding mode is now forced when provided explicitly and no 
more by default (we keep data intact when no mode provided).
 2014-05-13 13:22:29 +02:00
Florian HENRY
b6f091926f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-13 11:40:39 +02:00
Florian HENRY
d2e2dabf26 Add showempty into combobox 2014-05-13 11:40:19 +02:00
Laurent Destailleur
f918ae7e4f Decrease log level for disabled trigger 2014-05-13 10:36:01 +02:00
Laurent Destailleur
69eaefc459 Fix: The way we tested if a ref/id already exists was wrong. Introduce a 
common static method for this. Removed verifNumRef method.
Fix: Add missing logs
 2014-05-13 10:12:45 +02:00
Laurent Destailleur
bd061f4245 Fix: [ bug #1380 ] Customer invoices are not grouped in company results 
report
 2014-05-13 01:29:01 +02:00
Laurent Destailleur
18848eaf74 Clean forms 2014-05-12 13:25:36 +02:00
Laurent Destailleur
5fa05ee29d Start to clean code of templates to input lines 2014-05-12 12:53:10 +02:00
Laurent Destailleur
3393b1c5fb Fix: Date of invoice is set to current date when cloning. // TODO Best 
is to ask date into confirm box.
 2014-05-12 12:15:54 +02:00
Alexis Algoud
197ff1a653 Add detailled view in supplier order as in customer order 2014-05-12 12:10:53 +02:00
Laurent Destailleur
64f8dcf131 Fix: Bad syntax of vars 2014-05-12 12:10:52 +02:00
Alexis Algoud
f13c146908 Fix page numerotation as in company list 2014-05-12 11:00:58 +02:00
Laurent Destailleur
5f0c4dbe48 Fix: TCPDF error file not found in member card generation 2014-05-12 10:07:57 +02:00
Laurent Destailleur
bb4eed0a1e Merge pull request #1591 from defrance69/patch-9 
Update commonobject.class.php
 2014-05-12 01:56:39 +02:00
Laurent Destailleur
3f08664eee Merge pull request #1590 from marcosgdf/language-typo 
Corrected strings not translated and typos in English language
 2014-05-12 01:56:06 +02:00
Laurent Destailleur
d6858ec820 Merge pull request #1588 from aspangaro/develop 
Print instead of echo
 2014-05-12 01:54:06 +02:00
Laurent Destailleur
6b1bdf9913 Merge pull request #1587 from aternatik/odt_thirdpartycontact 
Fix : bad call of extrafields into contact substitution
 2014-05-12 01:53:41 +02:00
BENKE Charles
8c8c641411 Update commonobject.class.php 
$objecttype == 'order_supplier' already tested on the previous else if
 2014-05-11 23:19:18 +02:00
Laurent Destailleur
8428caf8fb List cleaner 2014-05-11 21:59:35 +02:00
aspangaro
376f140f64 Update en_US admin 2014-05-11 20:55:45 +02:00
aspangaro
4025fda62a Merge branch 'upstream/develop' 2014-05-11 20:53:15 +02:00
Laurent Destailleur
bafc53ad95 Fix: [ bug #1367 ] "Show invoice" link after a POS sell throws an error 2014-05-11 19:05:51 +02:00
Laurent Destailleur
0b0c9326b9 Fix: Missing form init 2014-05-11 18:55:18 +02:00
Laurent Destailleur
76330ad04a Fix: [ bug #1383 ] When add a salary payment - In bank, link "user" 
doesn't work
 2014-05-11 18:35:25 +02:00
Laurent Destailleur
09b5971b7d Fix: [ bug #1381 ] PHP Warning when listing stock transactions page 2014-05-11 18:05:59 +02:00
Laurent Destailleur
847fa3827b Fix: use wrong css 2014-05-11 17:56:29 +02:00
Laurent Destailleur
d4534f4a0b Fix: [ bug #1384 ] Wrong name for import products and product prices 2014-05-11 17:52:16 +02:00
Marcos García de La Fuente
7b05944530 Corrected strings not translated and typos in English language 2014-05-11 13:14:45 +02:00
jfefe
d69b7fb1dc Fix : bad redirect after resource deleting 2014-05-11 12:42:21 +02:00
jfefe
e7dfdd27b1 Fix: filter on POST value too restrictive 2014-05-11 12:33:49 +02:00
jfefe
8cba0fbcbe Remove reference to external module 2014-05-11 12:33:20 +02:00
jfefe
04161084cf Fix : missing method to delete linked resource 2014-05-11 12:26:57 +02:00
jfefe
e9453437f1 New : delete resource 2014-05-11 12:12:17 +02:00
jfefe
45aa1b9136 Use hook for resource card 2014-05-11 12:11:58 +02:00
jfefe
12aafd219d Fix : update linked resource 2014-05-11 10:19:38 +02:00
aspangaro
bb5d800524 Print instead of echo 2014-05-11 06:49:11 +02:00
jfefe
872b2c229e Fix : delete linked resource on an element 2014-05-11 00:49:01 +02:00
jfefe
ba1fc07037 Uniformize langage files 2014-05-11 00:38:03 +02:00
jfefe
e6bcf7c408 Missing langage file 2014-05-11 00:27:09 +02:00
jfefe
901c083ce6 Fix : bad link to list into resource menu 2014-05-11 00:26:54 +02:00
jfefe
225c7ae07b New : link resource with any element 
With tpl system, external modules can declare resource with hook getElementResources
 2014-05-10 22:07:54 +02:00
Jean-François Ferry
8f3940aab6 Use fetch_all() method into element resource list 2014-05-10 22:07:54 +02:00
Jean-François Ferry
b3f7e9f99b Fix : bad usage of this 2014-05-10 22:07:54 +02:00
Jean-François Ferry
a76fef5f35 Work on resource list / navbar into card 2014-05-10 22:07:13 +02:00
Jean-François Ferry
c2081b299f Missing resource type select list into add form 2014-05-10 22:07:13 +02:00
Jean-François Ferry
e4962e9efd Add resource card 2014-05-10 22:07:13 +02:00
Jean-François Ferry
6a9bf009f2 Clean code 2014-05-10 22:07:13 +02:00
Jean-François Ferry
7fbcb4fe7d Missing auto-increlent attribute when table c_resource_type create 2014-05-10 22:07:12 +02:00
Jean-François Ferry
5f74b86b18 Add dictionary to define type of resources 2014-05-10 22:07:12 +02:00
Jean-François Ferry
3e522b1f54 Add picto 2014-05-10 22:07:12 +02:00
Jean-François Ferry
87419bf357 Add lang chains 2014-05-10 22:07:12 +02:00
Jean-François Ferry
eb2c274525 Add method to load type code from dictionary 2014-05-10 22:07:12 +02:00
Jean-François Ferry
04aa373282 Add fetch and update method for resource 2014-05-10 22:07:12 +02:00
Jean-François Ferry
c42697dd78 New : can add new resource in database 2014-05-10 22:07:12 +02:00