Commit Graph

34721 Commits

Author SHA1 Message Date
Laurent Destailleur
a0358dc0c2 Better management of price of subproducts feature 2013-11-14 20:54:40 +01:00
Florian Henry
673c701ebc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-14 19:41:43 +01:00
Florian Henry
05e0af0f23 WebService contact with statut (the new field) 2013-11-14 19:41:27 +01:00
Laurent Destailleur
8b60c79033 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-14 17:17:19 +01:00
Peter Fontaine
5a1df20c80 fix contact creation 2013-11-14 17:16:27 +01:00
Laurent Destailleur
b911d30684 Fix: Stock into subproduct was wrong
New: Show best sell price and total for virtual products
2013-11-14 17:16:17 +01:00
simnandez
b9c8852471 Qual: Improve suppliers orders manual receivings 2013-11-14 17:08:59 +01:00
Laurent Destailleur
2e5320a532 Qual: Clean and uniformize code 2013-11-13 23:35:33 +01:00
Laurent Destailleur
cf3d6d410c Fix: Use correct css 2013-11-13 21:50:16 +01:00
Florian Henry
fe0006c71d Merge from dev 2013-11-13 21:34:02 +01:00
Florian Henry
a8e31ad956 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/lib/company.lib.php

Change-Id: Iec6a98430bfd500defda256862a1ed7869ef407a
2013-11-13 21:33:12 +01:00
Laurent Destailleur
588a30fa80 Fix: Bad status 2013-11-13 21:14:11 +01:00
Laurent Destailleur
e63542d8a6 Fix: avoid scroll 2013-11-13 20:37:05 +01:00
Laurent Destailleur
5a8f4905d6 Fix: bad link into ecm module 2013-11-13 20:36:07 +01:00
Laurent Destailleur
7a714906a0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-11-13 18:46:25 +01:00
Laurent Destailleur
d57aa65d30 Fix: Add option to fix warning not visible when there is preactivated
modules
2013-11-13 18:45:36 +01:00
Christophe Battarel
7dbe2bcf2c fix wrong buy price update 2013-11-13 18:41:31 +01:00
Florian Henry
652d7db0b4 Get Status from getLibStatus ! 2013-11-13 17:26:29 +01:00
Florian Henry
6d8871b4cf Add filter on show_contact company.lib.php 2013-11-13 17:02:30 +01:00
Florian Henry
0065adc298 Wrong call of show_contact into fourn/fiche.php 2013-11-13 16:37:17 +01:00
simnandez
e66371c6d1 New: Link to communities. Add official Support links 2013-11-13 16:35:02 +01:00
Peter Fontaine
844531e1d2 missing param phpdoc 2013-11-13 16:20:52 +01:00
Peter Fontaine
b965103fc3 Multiple Bank Account Number for Third Party 2013-11-13 15:40:17 +01:00
Laurent Destailleur
995bec6112 Fix: bad migration of 3.4 that make this text instead of varchar(50) 2013-11-13 15:09:22 +01:00
Florian Henry
a73275b9c1 Add prospect code client into prospect list 2013-11-13 13:17:32 +01:00
Florian Henry
4d0f554f33 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-13 13:15:56 +01:00
Laurent Destailleur
87f214dad4 Remove "realtime support" page. It was not up to date. 2013-11-13 12:47:59 +01:00
Florian Henry
8fca860a2d Add status filter on contact list 2013-11-12 15:40:00 +01:00
Raphaël Doursenaud
4ad5413163 Sync db upgrade with db install to avoid silly upgrade errors 2013-11-12 15:36:51 +01:00
Florian Henry
6bf2220a67 Add status filter into prospect and customer list 2013-11-12 15:22:11 +01:00
simnandez
d01a66ac9d Trad: Update es_ES 2013-11-12 12:43:26 +01:00
simnandez
3c097f34b8 Trad: Update es_ES 2013-11-12 12:35:45 +01:00
simnandez
84d6c96d79 Trad: Update es_ES 2013-11-12 10:55:27 +01:00
simnandez
058578c5b3 Trad: Fix bad source file 2013-11-12 10:19:12 +01:00
simnandez
3af6f683d9 Trad: Update admin.lang es_ES 2013-11-12 10:16:52 +01:00
Laurent Destailleur
2b12c492e2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/companies.lang
2013-11-11 22:29:54 +01:00
Laurent Destailleur
0ed2f4b891 Trans: Add usbek language 2013-11-11 22:25:32 +01:00
Florian Henry
5b7f2e0c53 Better nl_NL translation 2013-11-11 17:35:36 +01:00
Florian Henry
a76d5f8a1d Fix getNomURL societe 2013-11-11 16:29:35 +01:00
Florian Henry
d04f5c3148 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-11 16:24:10 +01:00
Florian Henry
53f01685e3 Display customer code (according setting) into list 2013-11-11 16:23:11 +01:00
Laurent Destailleur
b549f62e1d Merge pull request #1294 from aspangaro/develop
Fix for document cerfa into module Don
2013-11-10 14:59:16 -08:00
Laurent Destailleur
0dfbfbc19a Merge pull request #1293 from aspangaro/3.4
Fix for document cerfa into module Don
2013-11-10 14:58:39 -08:00
Laurent Destailleur
b3eec934b8 Merge pull request #1290 from atm-maxime/develop
Fix : SQL error on margin page
2013-11-10 14:57:42 -08:00
aspangaro
86a2da31b4 Fix for document cerfa into module Don 2013-11-10 06:52:20 +01:00
aspangaro
6b6855dff5 Fix for document cerfa into module Don 2013-11-10 06:37:08 +01:00
Laurent Destailleur
665f4ac83a Merge pull request #1289 from GPCsolutions/35b-review
35b review
2013-11-09 16:17:47 -08:00
Laurent Destailleur
18b55d5503 Merge pull request #1288 from GPCsolutions/35b-missingtable
Removed unused tables from installer
2013-11-09 16:11:31 -08:00
Laurent Destailleur
7633e46ee2 Merge pull request #1291 from defrance69/patch-18
Update societe.class.php
2013-11-09 16:09:23 -08:00
Laurent Destailleur
4b3778d116 Merge pull request #1292 from aspangaro/3.4
fix for language
2013-11-09 16:08:19 -08:00