Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
40,390 Commits 36 Branches 189 Tags
f34aadef3df57794de74006bc2c2c9fc4da6be12
Commit Graph

34721 Commits

Author SHA1 Message Date
Laurent Destailleur
561a1a1aac Fix: Miscellaneous problems on task tabs (withproject parameter lost and 
download fails).
 2014-03-14 02:07:54 +01:00
Laurent Destailleur
c8f63d6160 Fix: Prepare for 3.5.2 2014-03-14 00:17:39 +01:00
Laurent Destailleur
da5610bf3f Merge branch 'es_CL-language' of https://github.com/marcosgdf/dolibarr 
into marcosgdf-es_CL-language

Conflicts:
	ChangeLog
 2014-03-13 23:40:43 +01:00
Laurent Destailleur
dd7970b549 Fix: Regression, so introduce option to restore old behaviour. 2014-03-12 12:57:26 +01:00
Laurent Destailleur
e76f2170b3 Fix: Avoid home project page to hung when too many tasks opened. 2014-03-12 02:49:11 +01:00
Laurent Destailleur
4a983811d0 Fix: Avoid home project page to hung when too many tasks opened. 2014-03-12 02:43:31 +01:00
Laurent Destailleur
7684e9e4f7 Fix: Add PHPUnit test to check main.lang files does not contains rubish 
values for keys SeparatorXXX
Fix: Add PHPUnit test to check main.lang files does not contains rubish
values for keys FormatDateShortJaxaXXX
 2014-03-11 23:39:26 +01:00
Laurent Destailleur
241ae7a4d1 Fix: Miscellaneous bugs on tasks management 
Conflicts:
	htdocs/core/lib/project.lib.php
 2014-03-11 20:53:47 +01:00
Laurent Destailleur
86ad05c22e Merge pull request #1461 from marcosgdf/unknown-error 
Corrected Unknown error message typo
 2014-03-11 11:54:08 +01:00
Laurent Destailleur
5ee17a2f14 Merge pull request #1460 from atm-gauthier/3.5 
error on ajax_constantonoff function
 2014-03-11 11:53:44 +01:00
Laurent Destailleur
324402be0d Merge pull request #1465 from marcosgdf/bug-1295 
Fixed bug 1295: Error when creating an agenda extrafield with a number as reference
 2014-03-11 11:45:50 +01:00
Laurent Destailleur
67de6699d6 Fix: Translation of number for pt_PT 2014-03-11 01:37:37 +01:00
Marcos García de La Fuente
20262a0164 Fix bug #1295: Error when creating an agenda extrafield with a number as reference 2014-03-10 23:58:16 +01:00
Laurent Destailleur
be97066a74 Fix: Bug into sql request because of incomplete group by 2014-03-10 23:57:19 +01:00
Marcos García de La Fuente
89a4c51153 Added es_CL language 2014-03-10 21:13:16 +01:00
Marcos García de La Fuente
fa56fe4e8b Corrected Unknown error message typo 2014-03-10 19:36:32 +01:00
Laurent Destailleur
ccc40362e7 Fix: Must use div for columns of index pages. Not table. 2014-03-10 17:19:02 +01:00
Laurent Destailleur
21bf279248 Fix: css 2014-03-10 16:17:55 +01:00
Gauthier
92e8f54e9a error on ajax_constantonoff function 2014-03-10 10:53:20 +01:00
Laurent Destailleur
97677f08a9 Fix: Add protection to avoid memory hung 2014-03-10 01:49:44 +01:00
Laurent Destailleur
b2116c37d8 Enhance packager: 
- No need to be root to run script
- create git tag of version
- debian package do not use the deprecated dpatch command
- debian package is a quilt package (not native)
- debian package was missing file watch
- clean exclusion for zip and tgz package (exclusion must be done into
makepack-dolibarr.pl, not into specific package code)
- can publish files to sourceforge
 2014-03-09 01:37:08 +01:00
Laurent Destailleur
c082d7c82e Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/main.inc.php
 2014-03-08 14:17:49 +01:00
Laurent Destailleur
2e2f86b968 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/class/doleditor.class.php
	htdocs/main.inc.php
 2014-03-08 14:14:23 +01:00
Laurent Destailleur
a6bb785b5f Fix: Compatibility with v4 of ckeditor (for debian) 2014-03-08 14:06:01 +01:00
Laurent Destailleur
0a2a635755 Fix: td balance. 
Fix: New price was not used when editing a line when margin module was
on.
 2014-03-07 11:58:30 +01:00
Laurent Destailleur
06b2c646c3 Fix: Add a space after (int) for travis succes ;) 2014-03-06 18:31:02 +01:00
Alexis Algoud
d139009ef5 bug on update service with service created in 3.4 2014-03-05 15:29:28 +01:00
Laurent Destailleur
bea6887f9c Merge pull request #1444 from atm-alexis/3.5 
debug planned_workload loosing value on error
 2014-03-04 23:39:51 +01:00
Laurent Destailleur
df829177bc Fix: Submit form of graph box was reseting params of others. 2014-03-02 17:45:40 +01:00
Alexis Algoud
9de372d4b1 debug planned_workload loosing value on error 2014-03-02 17:33:51 +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
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
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
dfb4117bb5 Fix: Invalid image link 2014-03-01 14:58:06 +01:00
Laurent Destailleur
ea773531b5 Fix: [ bug #1206 ] PMP price is bad calculated 2014-03-01 14:49:30 +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
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
45898a989c Fix: Translation done twice 2014-03-01 10:16:03 +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
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
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
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