Commit Graph

40699 Commits

Author SHA1 Message Date
Léo
aeaf4bf5f8 Update index.php from Project folder
A trailing "quote" sign was causing a problem with the link generation of href in the recap table on dashboard.
2014-03-04 02:29:18 +01:00
Laurent Destailleur
b2d9fac993 More complete sql file 2014-03-03 19:39:44 +01:00
Laurent Destailleur
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
2014-03-03 19:38:02 +01:00
Laurent Destailleur
ba90565982 Removed hard coded value of version from makepack-dolibarr.pl script. 2014-03-03 19:08:13 +01:00
Laurent Destailleur
c2e3d92a37 Update images 2014-03-02 20:30:30 +01:00
Laurent Destailleur
df829177bc Fix: Submit form of graph box was reseting params of others. 2014-03-02 17:45:40 +01:00
Laurent Destailleur
c3bc0cc8d1 Add demo sql file for 3.6 2014-03-02 16:57:37 +01:00
Laurent Destailleur
fd9d0747c8 Fix: Bad description 2014-03-02 16:44:31 +01:00
Laurent Destailleur
d9dc8de4e6 Fix: Badd error message 2014-03-02 15:58:02 +01:00
Laurent Destailleur
748d769140 Fix: [ bug #1280 ] service with not end of date was tagged as expired. 2014-03-02 15:50:26 +01:00
Laurent Destailleur
8bd72cc21f Fix: wrapping into combo 2014-03-01 20:05:08 +01:00
Laurent Destailleur
7d7a72b8f1 More interactive autoselect of fields 2014-03-01 20:02:35 +01:00
Laurent Destailleur
d69cee03d8 More interactive autoselect of fields 2014-03-01 19:45:13 +01:00
Laurent Destailleur
c6fb7996ba Fix: [ bug #1238 ] When creating accompte with a %, free product are
used for calculation.
2014-03-01 19:11:13 +01:00
Laurent Destailleur
7db903e671 Fix: special code was lost during update 2014-03-01 16:58:10 +01:00
Laurent Destailleur
998ecc3c15 Optimize code. 2014-03-01 15:59:09 +01:00
Laurent Destailleur
b6cefee45a Fix: [ bug #1240 ] traduction 2014-03-01 15:21:11 +01:00
Laurent Destailleur
0b83f1a670 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-03-01 15:06:25 +01:00
Laurent Destailleur
6f4de6e6d0 Fix: [ bug #520 ] Product statistics and detailed lists are wrong 2014-03-01 15:05:00 +01:00
Laurent Destailleur
8d28087e69 Fix: [ bug #1206 ] PMP price is bad calculated 2014-03-01 14:58:33 +01:00
Laurent Destailleur
dfb4117bb5 Fix: Invalid image link 2014-03-01 14:58:06 +01:00
Laurent Destailleur
16d759b0d6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-01 14:55:11 +01:00
Laurent Destailleur
325b9c9688 Qual: Removed dead code 2014-03-01 14:54:11 +01:00
Laurent Destailleur
ea773531b5 Fix: [ bug #1206 ] PMP price is bad calculated 2014-03-01 14:49:30 +01:00
Laurent Destailleur
206181a542 Merge pull request #1441 from syrus34/patch-3
Update commondocgenerator.class.php
2014-03-01 13:40:14 +01:00
Laurent Destailleur
a084887442 Merge branch 'project-translations' of
https://github.com/marcosgdf/dolibarr into
marcosgdf-project-translations

Conflicts:
	ChangeLog
2014-03-01 13:38:50 +01:00
Laurent Destailleur
8c4369eacc Merge pull request #1442 from aspangaro/develop
Problem of presentation when skype module is enabled
2014-03-01 13:37:36 +01:00
Laurent Destailleur
19b68e87e9 Merge branch 'bug-1123' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1123

Conflicts:
	ChangeLog
2014-03-01 13:29:34 +01:00
Laurent Destailleur
67ba184f14 Merge pull request #1443 from defrance69/patch-33
Update llx_00_c_pays.sql
2014-03-01 13:27:57 +01:00
BENKE Charles
e5e7b4ce6a Update llx_00_c_pays.sql
adding burundi in pays database
2014-03-01 12:30:39 +01:00
Laurent Destailleur
45898a989c Fix: Translation done twice 2014-03-01 10:16:03 +01:00
Laurent Destailleur
66a3a28eb2 Fix: Update translation guide 2014-02-28 22:51:04 +01:00
Laurent Destailleur
072bb709ff Fix: dead code 2014-02-28 22:09:40 +01:00
Laurent Destailleur
6662f8b5a3 Fix: Bad picto for project setup page 2014-02-28 21:54:50 +01:00
Laurent Destailleur
b64a2b2718 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/comm/action/fiche.php
2014-02-28 21:43:29 +01:00
Laurent Destailleur
68a508a0d1 Fix: sql error on numbering module for tasks 2014-02-28 21:40:08 +01:00
Laurent Destailleur
74404749c6 Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a 2014-02-28 16:00:57 +01:00
aspangaro
cd910b30c9 Problem of presentation when skype module is enabled 2014-02-28 07:20:15 +01:00
syrus34
dbdb8de79d Update commondocgenerator.class.php
With version 3.5, a company can have several bank account
2014-02-28 07:06:38 +01:00
Laurent Destailleur
de159d569a Fix: Missing transactions 2014-02-27 16:40:25 +01:00
BENKE Charles
303c459777 Update modProjet.class.php
bad incrementation
2014-02-27 11:29:08 +01:00
Laurent Destailleur
193a551b0a Merge pull request #1421 from defrance69/patch-30
Update modProjet.class.php
2014-02-27 11:19:28 +01:00
Laurent Destailleur
8f0e96fd02 Merge pull request #1440 from grandoc/develop
anglicized
2014-02-27 11:17:30 +01:00
Laurent Destailleur
a453d24eea Merge pull request #1437 from marcosgdf/invoice-types
Replacing invoice integer types with Facture and FactureFournisseur constants
2014-02-27 11:11:19 +01:00
Laurent Destailleur
b21d1cd5b2 Merge pull request #1439 from altairis-fr/develop
Fix: default ref was DOLIBARR instead of SPECIMEN, so specimen generation did not work and crashed dolibarr
2014-02-27 11:09:35 +01:00
Laurent Destailleur
827f7e898a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-02-27 10:50:27 +01:00
Laurent Destailleur
06b1c8b64a Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
2014-02-27 10:47:15 +01:00
Laurent Destailleur
f7fe25e408 Uniformize code to prepare mass update 2014-02-27 10:37:23 +01:00
philippe
5c4ceb1a53 anglicized 2014-02-27 10:06:11 +01:00
philippe
1223e6a08b anglicized 2014-02-27 09:54:31 +01:00