Juanjo Menent
376b2812fe
Merge pull request #1190 from altairis-fr/develop
...
add ability to modify margin rate on line edit if authorized
2013-08-23 00:18:08 -07:00
Christophe Battarel
26b8f29682
fix display of buying price on line edit when no supplier price is defined
2013-08-23 09:16:37 +02:00
Christophe Battarel
edf7af444c
fix margin reports bugs (wrong group by + jquery syntax error)
2013-08-23 09:10:15 +02:00
Christophe Battarel
ecdce9ddf6
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr into 3.4
2013-08-23 09:07:10 +02:00
Florian Henry
aeb072b1eb
Fix: Link "Show all supplier invoice" on suplier card not working
2013-08-23 09:02:50 +02:00
Juanjo Menent
37e3455f82
Merge pull request #1191 from FHenry/3.4
...
Fix: Link "Show all supplier invoice" on suplier card not working
2013-08-22 23:59:16 -07:00
Laurent Destailleur
9da5f7f47a
Qual: Doxygen
2013-08-22 16:49:23 +02:00
Florian Henry
4f991da846
Fix: Link "Show all supplier invoice" on suplier card not working
2013-08-22 15:11:11 +02:00
Laurent Destailleur
c1dae58055
Fix: Bad translation (to pick to 3.4)
2013-08-22 12:46:10 +02:00
Christophe Battarel
4df216afbc
add ability to define margin when adding line with new experimental form
2013-08-22 12:13:14 +02:00
Christophe Battarel
f37c24f8ff
allow to modify margin rate or mark rate but not both
2013-08-22 11:45:27 +02:00
Christophe Battarel
e672783adb
add ability to modify margin rate on line edit if authorized
2013-08-22 11:39:55 +02:00
lalaina rasamoelina
8a4041e534
T975-develop Add an element (statut) in the table llx_socpeople
...
It's used to mark if the contact is gone or no(we can activate or desactivate the contact with this)
And if the contact is gone,we don't print her mail in the mail list,where we can send a mail
2013-08-22 11:04:06 +02:00
lalaina rasamoelina
1295c8d27b
Put the status of contact in the list of contact
2013-08-22 11:04:06 +02:00
lalaina rasamoelina
dc3ccf6373
Style of page
2013-08-22 11:04:06 +02:00
lalaina rasamoelina
148abfbe72
Printing the contact in the list
2013-08-22 11:04:06 +02:00
lalaina rasamoelina
5ed186e178
Delete the contact who are gone,in the email list
2013-08-22 11:04:06 +02:00
lalaina rasamoelina
83d5c1a441
Printing of contact
2013-08-22 11:04:05 +02:00
Christophe Battarel
32dd1e4480
fix display of buying price on line edit when no supplier price is defined
2013-08-22 10:45:42 +02:00
lalaina rasamoelina
f913422e62
T999-develop: link invoice to a command
...
If you do not create the invoice from the order,
it can connect to a command by clicking "bind a command"
2013-08-22 10:17:03 +02:00
Laurent Destailleur
05040d1997
Fix: B1032-develop: Problem in the filter of Contact by company category
2013-08-21 22:42:08 +02:00
Laurent Destailleur
f0dee93f78
Fix: B1032-develop: Problem in the filter of Contact by company category
2013-08-21 22:34:13 +02:00
Laurent Destailleur
52d39915d7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-08-21 22:21:33 +02:00
Laurent Destailleur
ea4ac30b28
Fix: more responsive box
2013-08-21 21:39:39 +02:00
Christophe Battarel
dd32dbacb5
Fix retrieving of margin info when invoice created automatically from order (used by workflow module)
2013-08-21 18:55:11 +02:00
simnandez
dfe2b7ec4d
Fix UserGroup name not display in card view or edit
2013-08-21 18:47:51 +02:00
Florian Henry
71ec4ea31c
Merge remote-tracking branch 'origin/3.4' into 3.4
...
Conflicts:
ChangeLog
Change-Id: I325ab3266300286664f4790b5f2314255ac1911d
2013-08-21 17:32:52 +02:00
Florian Henry
ba4fde20ce
Fix UserGroup name not display in card view or edit
2013-08-21 17:03:13 +02:00
Christophe Battarel
d4bf87aa77
fix old bug on reordering supplier products in list
2013-08-21 15:31:08 +02:00
Juanjo Menent
b6d998d1c5
Merge pull request #1185 from altatof/3.4
...
fix old bug on reordering supplier products in list
2013-08-21 06:27:22 -07:00
Christophe Battarel
9ac22149d4
fix old bug on reordering supplier products in list
2013-08-21 15:18:00 +02:00
Laurent Destailleur
327aa80ed0
Fix: Error management
...
New: Autoselect category in list if there is only one element in list.
2013-08-21 13:02:33 +02:00
Laurent Destailleur
c4bc10b8eb
Qual: Clean code by moving synchro with mailman into mailman trigger
...
New: A trigger can return an array of error strings instead of one error
string.
2013-08-21 12:39:20 +02:00
simnandez
1f05800909
Fix: [ bug #1037 ] Consumption> Supplier invoices related
2013-08-21 12:08:43 +02:00
simnandez
4e34e7b71c
Fix: [ bug #1037 ] Consumption> Supplier invoices related
2013-08-21 12:06:02 +02:00
simnandez
b5e10a061b
[ task #1036 ] Normalized usage of setEventMessage instead of
...
dol_htmloutput_mesg
2013-08-20 16:50:33 +02:00
simnandez
db46bc88ca
[ task #1036 ] Normalized usage of setEventMessage instead of
...
dol_htmloutput_mesg
2013-08-20 16:10:01 +02:00
simnandez
913888824f
Remove duplicate $user
2013-08-20 12:26:39 +02:00
Christophe Battarel
4c7741f5f0
manage user permissions for margin display
2013-08-20 12:11:19 +02:00
Christophe Battarel
06b8e939bd
manage user permissions for margin rate
2013-08-20 12:04:01 +02:00
Christophe Battarel
220f9b7e9f
define global user variables so templates can manage user permissions
2013-08-20 12:01:52 +02:00
Christophe Battarel
8128ed0556
define user permissions on margin module
...
update changelog
2013-08-20 12:00:16 +02:00
Laurent Destailleur
e460aa335c
New: When there is no data on pie chart, can set color to an empty
...
value.
2013-08-20 11:51:24 +02:00
Juanjo Menent
002c3097c7
Merge pull request #1180 from FHenry/develop
...
Add category into filter into webservice thirdparty method
2013-08-20 00:29:27 -07:00
simnandez
9741b49b75
[ task #1036 ] Normalized usage of setEventMessage instead of
...
dol_htmloutput_mesg
2013-08-20 09:28:23 +02:00
Laurent Destailleur
b18d5166de
Fix: Size of picture into PDF
2013-08-19 13:30:30 +02:00
Grand Philippe
49e38e1263
fix some trad
2013-08-16 10:16:06 +02:00
Florian Henry
4932c116e0
fix mispelling
2013-08-15 12:50:16 +02:00
Florian Henry
472d218372
Add category into filter into webservice thirdparty method
...
getListOfThirdParties
2013-08-15 10:39:59 +02:00
simnandez
fa5f09d6e0
[ task #1036 ] Normalized usage of setEventMessage instead of
...
dol_htmloutput_mesg: Works in admin
2013-08-14 12:48:00 +02:00
