2
0
forked from Wavyzz/dolibarr
Commit Graph

32295 Commits

Author SHA1 Message Date
Laurent Destailleur
06f36fbfab Fix: Bad permission check 2013-09-24 10:59:15 +02:00
Laurent Destailleur
53979ad58c Fix: Bad param 2013-09-20 14:29:09 +02:00
Laurent Destailleur
369eabc69e Fix: bad condition
Conflicts:
	htdocs/societe/societe.php
2013-09-18 23:26:35 +02:00
Laurent Destailleur
5cbccd5fc0 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-09-16 13:44:37 +02:00
Laurent Destailleur
a1e7333613 Fix: bug preventing creation of predefined invoice.
Also added phpunit test to detect it if it occurs again.
2013-09-16 13:42:42 +02:00
Laurent Destailleur
efcab8a596 Merge pull request #1237 from altairis-fr/3.4
Fix: Supplier price displayed on document lines and margin infos didnt take discount
2013-09-15 06:57:22 -07:00
Christophe Battarel
775d259f88 Fix: Supplier price displayed on document lines and margin infos didnt take discount 2013-09-15 14:52:41 +02:00
Laurent Destailleur
c1b6e05cc0 Fix: bad sql syntax 2013-09-15 12:46:54 +02:00
Christophe Battarel
6959ccf627 Fix: Supplier price displayed on document lines didnt take discount 2013-09-15 11:41:41 +02:00
Laurent Destailleur
914e167183 Fix: Bad sql request 2013-09-14 14:34:45 +02:00
Laurent Destailleur
443eba900a Fix: Bad translation 2013-09-14 12:52:04 +02:00
Laurent Destailleur
707bba3d7d Fix: W3C 2013-09-13 10:40:49 +02:00
Laurent Destailleur
54976951a1 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-13 09:24:09 +02:00
Laurent Destailleur
86e827e3f7 Fix: Missing sources
Fix: packager
2013-09-12 23:47:36 +02:00
simnandez
817569d487 Fix: [ bug #1062 ] Documents lost in propals and contracts validating 2013-09-12 16:54:47 +02:00
Laurent Destailleur
899c209468 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-11 23:10:54 +02:00
Laurent Destailleur
6f2652f2b6 Fix: Use correct standard 2013-09-11 23:07:47 +02:00
Laurent Destailleur
301187a117 Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	COPYRIGHT
	dev/initdata/mysqldump_dolibarr_3.3.0.sql
	htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js
2013-09-11 21:54:57 +02:00
Laurent Destailleur
d6c35c1ee7 Fix: Opensource rules violation (sources must be included with lib) 2013-09-11 21:39:33 +02:00
Laurent Destailleur
2db0a56b17 Merge pull request #1225 from jfefe/fix_ws_order
Fix : missing lib / bad property name in order webservice
2013-09-10 02:44:22 -07:00
jfefe
5abbee02c8 Fix : missing lib / bad property name in order webservice 2013-09-10 11:23:36 +02:00
simnandez
43beb38c9b Fix: [ bug #1061 ] Bad info shipped products 2013-09-10 11:04:36 +02:00
Laurent Destailleur
2b8af33505 Fix: eof 2013-09-09 19:15:34 +02:00
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
651596e8d5 Fix: missing ; 2013-09-06 13:42:14 +02: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