jfefe
13e235ca8a
Fix: permission check in invoice webservice
...
remove comment & indent code
2013-09-09 17:08:22 +02:00
Laurent Destailleur
afe58abdcd
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
...
Conflicts:
ChangeLog
2013-09-08 21:51:37 +02:00
Christophe Battarel
9fa37fc5f1
Fix: Edit propal line was losing product supplier price id
...
Conflicts:
ChangeLog
2013-09-08 21:51:08 +02:00
Laurent Destailleur
2d354de549
Merge pull request #1211 from FHenry/3.4
...
Fix: Delete linked element to supplier invoice when deleted (as done for
2013-09-06 13:49:27 -07:00
Laurent Destailleur
f45be6a2a7
Prepare for 3.4.1
...
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
build/debian/changelog
2013-09-06 01:37:07 +02:00
Florian Henry
2740cc78b6
Add dol_syslog
...
Fix bug on expedition create : create expedition with rowid (or
origin_id) that already exits, and you will have all product of the
other expedition and the new expedition form order
Revert previous commit filter sort on fourn/facture/index.php
2013-09-05 17:45:30 +02:00
Florian Henry
95ff16f145
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-09-05 17:39:49 +02:00
Laurent Destailleur
e40d644085
Fix: Remove warning
2013-09-04 16:49:20 +02:00
Laurent Destailleur
af22d38681
Fix: Bad total without tax
2013-09-04 15:07:35 +02:00
Laurent Destailleur
b1c25d91cd
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-09-04 10:45:35 +02:00
Laurent Destailleur
ee0f44c9e3
Fix: Try a fix of cloning lines->array
2013-09-04 10:45:15 +02:00
aspangaro
91320ef99c
Update translation fr_FR
2013-09-04 05:17:33 +02:00
Florian Henry
ddeca06f32
Real ref filter
2013-09-03 21:13:05 +02:00
Florian Henry
cb86cd403c
Fix: Delete linked element to supplier invoice when deleted (as done for
...
all other object into dolibarr)
2013-09-03 20:01:10 +02:00
simnandez
83042459a5
Fix: compatiblity with multicompany module
2013-09-02 10:07:44 +02:00
Laurent Destailleur
b95aa1ac7b
Fix: select list on external table
...
Conflicts:
htdocs/core/class/extrafields.class.php
2013-09-02 00:41:14 +02:00
simnandez
b86e20f0e6
Fix: Intervention box links to contracts id
2013-08-29 12:05:29 +02:00
simnandez
fa4a9c73c4
Fix: Localtaxes balance not showing
2013-08-29 09:58:07 +02:00
Laurent Destailleur
e741ce9ea2
Merge pull request #1201 from FHenry/3.4
...
Fix: Mailing module : if an email is already in destinaires list all
2013-08-28 07:41:01 -07:00
Florian Henry
cc90c92cc0
Fix: Mailing module : if an email is already in destinaires list all
...
other email from selector was not inserted
2013-08-28 16:33:21 +02:00
Laurent Destailleur
cfa7b6ead9
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-08-28 13:13:22 +02:00
Laurent Destailleur
b39046ca7e
Fix: Add missing syslog
2013-08-28 13:05:14 +02:00
simnandez
dfd14f4430
Fix: [ bug #1043 ] Bad interventions ref numbering
2013-08-27 09:44:00 +02:00
Laurent Destailleur
9cf2d8c556
Merge pull request #1199 from GPCsolutions/3.4-fixmissingparameter
...
Update parameter as expected by the function name
2013-08-26 14:12:30 -07:00
Raphaël Doursenaud
dcc87263d0
Update parameter as expected by the function name
2013-08-26 18:26:11 +02:00
Florian Henry
2dce07590c
Fix: If only service module is activated, it's impossible to delete
...
service
2013-08-26 14:39:35 +02:00
Laurent Destailleur
cafd75ac4a
Revert a bad fix.
2013-08-24 21:55:02 +02:00
Laurent Destailleur
1c08cad6b9
Fix: Bad translation (to pick to 3.4)
...
Conflicts:
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/main.lang
2013-08-24 21:41:36 +02:00
Laurent Destailleur
1c527b8db9
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-08-24 20:59:02 +02:00
simnandez
c242d66530
Fix: [ bug #1039 ] Pre-defined invoices conversion
2013-08-23 18:03:16 +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
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
Florian Henry
4f991da846
Fix: Link "Show all supplier invoice" on suplier card not working
2013-08-22 15:11:11 +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
Laurent Destailleur
05040d1997
Fix: B1032-develop: Problem in the filter of Contact by company category
2013-08-21 22:42:08 +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
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
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
simnandez
4e34e7b71c
Fix: [ bug #1037 ] Consumption> Supplier invoices related
2013-08-21 12:06:02 +02:00
Grand Philippe
49e38e1263
fix some trad
2013-08-16 10:16:06 +02:00
Florian Henry
60b3f61339
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
...
Conflicts:
ChangeLog
2013-08-13 12:13:47 +02:00
Florian Henry
d6c7ac5f73
Fix canvas feature broken
2013-08-13 09:16:39 +02:00
Florian Henry
da565b2c7f
Change-Id: I3d7bc928bf2428e4a96c61fd9d22e8235792dfe7
2013-08-12 19:43:51 +02:00
simnandez
067c8c55b9
Fix: [ bug #1033 ] SUPPLIER REF disappeared
2013-08-12 18:42:01 +02:00
Florian Henry
26d1352de4
Fix update extrafield do not display immediatly
2013-08-12 14:30:42 +02:00
Laurent Destailleur
34987d3e8b
Exclude conf.php file from git
2013-08-10 13:02:13 +02:00
Florian Henry
75701ee995
Fix: Supplier invoice and supplier order are not displayed into object
...
link into agenda event card
2013-08-09 13:11:18 +02:00
