lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,679 Commits 43 Branches 150 Tags 886 MiB
044ec61aba
Commit Graph

33679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Regis Houssin
044ec61aba Merge pull request #446 from atm-maxime/develop 
Task # 186 : Forgot to add the new box in the mod definition...
 2012-10-08 23:50:49 -07:00
Regis Houssin
bfee8553f0 Merge pull request #445 from atm-maxime/mko543 
Bug # 543 and # 570 : contact address is now used in recipient block and...
 2012-10-08 23:50:29 -07:00
Regis Houssin
d61a8ee947 Fix: missing comma 2012-10-09 08:47:11 +02:00
Regis Houssin
089603e1c5 Fix: add import_key field 2012-10-09 08:40:32 +02:00
Maxime Kohlhaas
67dbae4486 Correction for new box inclusion 2012-10-09 00:58:07 +02:00
Maxime Kohlhaas
229005b1a9 Task # 186 : Forgot to add the new box in the mod definition... 2012-10-09 00:54:02 +02:00
Maxime Kohlhaas
d343b76f91 Bug # 543 and # 570 : contact address is now used in recipient block and no more display bug on customer order ref until 36 digits 2012-10-09 00:28:52 +02:00
Regis Houssin
478449da37 Fix: convert line delimiters 2012-10-08 20:47:10 +02:00
Regis Houssin
93d760e0fc Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-08 20:44:28 +02:00
Regis Houssin
7f7676d357 Fix: uniformize variable name 2012-10-08 20:44:12 +02:00
Laurent Destailleur
d51db70768 Missing translation 2012-10-08 20:25:03 +02:00
Laurent Destailleur
26f4b344cb Merge pull request #444 from cbattarel/develop 
fix wrong update in previous commit
 2012-10-08 10:55:33 -07:00
Regis Houssin
c35a1ebaf7 Fix: missing drop foreign key 2012-10-08 19:38:09 +02:00
Regis Houssin
0975918cc6 Fix: [task #146] Remove table llx_categorie_association 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-10-08 19:27:02 +02:00
Christophe Battarel
99b323e8d0 fix wrong update in previous commit 
(it was always remaining on step 5 !)
 2012-10-08 16:25:50 +02:00
Regis Houssin
67c41721f5 Merge pull request #443 from marcosgdf/translations 
Minor changes to es_ES translations
 2012-10-08 03:01:57 -07:00
Regis Houssin
88785a8fef Merge pull request #442 from cbattarel/develop 
fix wrong last update in cleansep function
 2012-10-08 03:01:34 -07:00
Regis Houssin
7028cf66d4 Merge pull request #441 from marcosgdf/minor 
Code improvements
 2012-10-08 03:00:56 -07:00
Marcos García
fed3c20548 Minor changes to es_ES translations 2012-10-08 11:44:55 +02:00
Christophe Battarel
04be578863 fix wrong last update in cleansep function 2012-10-08 11:32:28 +02:00
Marcos García
734b292440 Merge branch 'develop' into bug-569 
Conflicts:
	htdocs/install/inc.php
 2012-10-08 11:16:33 +02:00
Marcos García
8ed706e4ac Fixed bug #569 - Notices & Warnings when installing Dolibarr 
Also translated a string & variable and improved html use
 2012-10-08 02:45:58 +02:00
Laurent Destailleur
68ecc5eb89 Upgrade doliwamp 2012-10-08 02:38:30 +02:00
Laurent Destailleur
f9ceb78f58 Beautify instal pg. 
Fix: Debian package
 2012-10-07 20:04:07 +02:00
Laurent Destailleur
18da651975 Update logo 2012-10-07 15:21:52 +02:00
Laurent Destailleur
566855d7e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2012-10-06 23:15:10 +02:00
Laurent Destailleur
215d7a883e Fix: Revert bugged new feature that show false information. 2012-10-06 23:13:46 +02:00
Laurent Destailleur
430b63f4e1 Fix: Bad message 2012-10-06 22:54:23 +02:00
Laurent Destailleur
4789b5e2d1 Fix: Usage of specific mysql function is forbidden 2012-10-06 22:46:54 +02:00
Laurent Destailleur
053b4dd63c New: [ task #210 ] Can choose cash account during POS login 2012-10-06 21:47:59 +02:00
Laurent Destailleur
b2ec0a7669 Merge pull request #438 from simnandez/develop 
Trad: Add ca_ES and es_ES translations
 2012-10-06 11:16:23 -07:00
Laurent Destailleur
8bb972e3ab Merge pull request #439 from atm-maxime/develop 
Add changelog entries
 2012-10-06 11:15:40 -07:00
Laurent Destailleur
8076719d9c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-06 19:25:43 +02:00
Laurent Destailleur
a659e6f9f7 More elegant position of button to aufofill fields. 2012-10-06 19:25:25 +02:00
Maxime Kohlhaas
5aa9a8e41d Add changelog entries 2012-10-06 13:53:37 +02:00
simnandez
7faa90e831 New: More import options. Prepare database 2012-10-06 09:52:33 +02:00
simnandez
2d4957d415 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2012-10-06 09:38:09 +02:00
Laurent Destailleur
e5cd2c1941 Init script can run on rom command line 2012-10-05 23:20:18 +02:00
Laurent Destailleur
6873e93b7f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-05 19:40:09 +02:00
Laurent Destailleur
34f2402cb5 Qual: Removed dead code 2012-10-05 19:39:53 +02:00
simnandez
0e5cc34b1f Trad: Add ca_ES and es_ES translations 2012-10-05 18:50:30 +02:00
Regis Houssin
b1ad840055 Fix: optimize code 2012-10-05 15:12:17 +02:00
Regis Houssin
6b21ca442d New: add possibility to defined position/job of a user 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-10-05 12:40:19 +02:00
Regis Houssin
f3086ae23d Merge pull request #437 from atm-maxime/develop 
Branch mko186 merged
 2012-10-04 23:56:45 -07:00
Maxime Kohlhaas
85c03faec7 Merge branch 'mko186' into develop 
Conflicts:
	htdocs/langs/en_US/orders.lang
	htdocs/langs/fr_FR/orders.lang
 2012-10-05 08:30:09 +02:00
Maxime Kohlhaas
c4c4648176 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-10-05 08:27:36 +02:00
Regis Houssin
1b7f93fc29 Merge pull request #436 from simnandez/develop 
Task # 104: Check if module invoice is active and user has creation permissions. Move creation invoice to action bar into customer card
 2012-10-04 10:06:22 -07:00
Regis Houssin
6b50219999 Fix: add function for build $mysoc object 2012-10-04 18:54:56 +02:00
simnandez
f873198442 Fix: Warning into perms page 2012-10-04 18:40:05 +02:00
simnandez
caef97dc08 Task # 104: Check if module invoice is active and user has creation 
permissions. Move creation invoice to action bar into customer card
 2012-10-04 18:23:21 +02:00