Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
37,013 Commits 39 Branches 191 Tags
4fa99a86ed8a1cd274f1984e999474189b7859cd
Commit Graph

37013 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
4fa99a86ed Fix: Bad permissions 2013-05-29 21:18:21 +02:00
simnandez
00395c87a8 Fix: [ bug #916 ] Products complementary attributes, imports and 
multicompany
Fix: [ bug #917 ] Missing field type in products complementary
attributes imports

No Changelog Update need, because complementary attributes is new in 3.4
 2013-05-29 18:17:39 +02:00
Juanjo Menent
e5aa78aa86 Merge pull request #1002 from FHenry/3.4 
Add translation from pcbelt@hotmail.com(Rodrigo Beltrán) get from
 2013-05-29 07:12:18 -07:00
Florian Henry
eb6e6ecc71 update trans 2013-05-29 16:05:35 +02:00
Florian Henry
b563877f5a Add translation from pcbelt@hotmail.com(Rodrigo Beltrán) get from 
assodolibarr@gmail.com
 2013-05-29 15:56:32 +02:00
Laurent Destailleur
b2600e8880 Fix: Missing trans 2013-05-29 02:20:30 +02:00
Laurent Destailleur
2878d6f423 Fix version 2013-05-29 01:32:56 +02:00
Laurent Destailleur
1cb33c43bd Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/comm/action/listactions.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/agenda.lib.php
	htdocs/product/liste.php
 2013-05-29 01:30:36 +02:00
Laurent Destailleur
f8e019248d Fix: But siwtiching to auguria menu. 2013-05-29 01:24:57 +02:00
Laurent Destailleur
6d2db1c09f Merge pull request #977 from cbattarel/3.3 
[ bug #806 ] Tasks are ordered alphabetically instead of chronological order
 2013-05-28 15:14:02 -07:00
Laurent Destailleur
c4b12a6a83 Merge pull request #997 from FHenry/3.4 
3.4
 2013-05-28 14:42:05 -07:00
Florian Henry
8a726ab51b Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-05-28 21:51:11 +02:00
Florian Henry
3ddb410e2e Change comment on dol_include_once method 2013-05-28 17:53:56 +02:00
simnandez
485c7bc477 Fix: Trad categories more accurate 2013-05-28 15:19:24 +02:00
simnandez
0c62942f03 [ bug #914 ] It is not possible to validate a supplier invoice 2013-05-28 09:28:31 +02:00
Laurent Destailleur
5090cfee54 Fix: Clear of list broken 2013-05-27 16:12:33 +02:00
Laurent Destailleur
37119e70f1 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-27 12:52:11 +02:00
Laurent Destailleur
4be5ffc937 Fix: Syntax error 2013-05-26 15:38:17 +02:00
Laurent Destailleur
b4ae479a69 Merge pull request #988 from FHenry/3.3 
Fix [ bug #911 ] Reorder intervention do not work and PgSQL
 2013-05-26 05:59:54 -07:00
Laurent Destailleur
2e8d2b884f Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-05-26 13:31:11 +02:00
Laurent Destailleur
c66304e217 Fix: Update version 2013-05-26 13:20:37 +02:00
Florian Henry
f543f00024 Fix PGSQL Bugs 
Removing parenthesis make query works for MySQL and PgSQL
 2013-05-26 10:34:00 +02:00
Florian Henry
56556ba222 Fix [ bug #911 ] Reorder intervention do not work 2013-05-26 10:15:43 +02:00
Laurent Destailleur
2005ce8d6e Fix: Error with jmobile 2013-05-26 05:02:46 +02:00
Laurent Destailleur
f054032e79 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-26 04:06:34 +02:00
Laurent Destailleur
268c1cfa29 Fix: Removed useless file (not correctly defined) to avoid cache 
problems
 2013-05-26 03:57:34 +02:00
Laurent Destailleur
f239ec2aee Merge pull request #986 from FHenry/3.4 
Fix [ bug #911 ] Reorder intervention do not work
 2013-05-25 14:41:33 -07:00
Florian Henry
557756058f Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 
Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I1754b68e9acdf1c7e6024afe95d9ded8e0726b41
 2013-05-25 20:58:02 +02:00
Laurent Destailleur
15402b9286 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-25 20:43:31 +02:00
Laurent Destailleur
e3e00b034b Fix: Dir with linked files was not renamed when invoices was renamed 
with its final ref (linked files were lost)
Fix: Ref visible into message was wrong.
Fix: Bad counting of product/service available
 2013-05-25 20:43:01 +02:00
Florian Henry
c61f7b6390 Fix [ bug #911 ] Reorder intervention do not work 2013-05-25 19:48:49 +02:00
Regis Houssin
309f59fb00 Fix: wrong field name 2013-05-25 19:03:16 +02:00
Laurent Destailleur
9ffbed07fe Fix: More consistent fix 2013-05-25 18:16:13 +02:00
Laurent Destailleur
8fa9a60bc6 Fix: Bad field size 2013-05-25 18:12:07 +02:00
Laurent Destailleur
2a96172294 Fix: Pb in synchro update 2013-05-25 18:12:00 +02:00
Laurent Destailleur
f16026b79c Fix: cyclic updates 2013-05-25 18:11:54 +02:00
Laurent Destailleur
99c657255e Fix: Bug erase member data 2013-05-25 18:11:42 +02:00
Laurent Destailleur
982fec65ec Merge pull request #984 from FHenry/3.4 
Fix [ bug #895 ] Description is lost when adding a new predefined
 2013-05-25 08:11:48 -07:00
Florian Henry
8656a9f417 Fix [ bug #895 ] Description is lost when adding a new predefined 
product to a contract
 2013-05-25 16:50:55 +02:00
Christophe Battarel
b8c51e3760 sort tasks by start date 2013-05-25 11:49:05 +02:00
Laurent Destailleur
389d64c25b Merge pull request #982 from FHenry/3.3 
Fix search product if multilingue
 2013-05-25 02:01:14 -07:00
Laurent Destailleur
7b13be4653 Merge pull request #978 from atm-maxime/3.4 
Fix : Reset every month with @99 was not working properly (for 3.4 branc...
 2013-05-25 01:59:15 -07:00
Laurent Destailleur
4c54bfe3a9 Merge pull request #980 from FHenry/3.4 
Fix multilangue search product list
 2013-05-25 01:52:06 -07:00
Florian Henry
5b02a3a67c Fix search product if multilingue 2013-05-24 22:44:26 +02:00
Florian Henry
0a041a7705 Fix multilangue search product list 2013-05-24 22:39:28 +02:00
Laurent Destailleur
7b29e58760 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
 2013-05-24 19:07:20 +02:00
Laurent Destailleur
eecfbf9670 Fix: Bad link if not supplier defined for product 2013-05-24 18:55:04 +02:00
Laurent Destailleur
9ecb1ddcb4 Fix: Missing translation 2013-05-24 18:53:28 +02:00
Laurent Destailleur
c97d1cb15b Try a fix for some browsers 2013-05-24 18:29:59 +02:00
Laurent Destailleur
7bbdae239f Fix: Removed errors with not defined vars 2013-05-24 14:32:12 +02:00