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

33655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Maxime Kohlhaas
16f82216bf Task # 186 : Add stock column in sql request to get object lines + display alert icon if stock is too low 2012-10-04 16:26:33 +02:00
Maxime Kohlhaas
5a64e3b1ec Task # 104 : Commited these 2 files instead of translations files 2012-10-04 15:43:52 +02:00
Laurent Destailleur
5c6b0c064e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-10-04 15:43:28 +02:00
Laurent Destailleur
9ba100a84b New: Support removing tab into member module 2012-10-04 15:37:10 +02:00
Maxime Kohlhaas
0e17c7c063 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko186 2012-10-04 15:36:47 +02:00
Maxime Kohlhaas
87d643d482 Task # 104 : translations 2012-10-04 15:36:38 +02:00
Maxime Kohlhaas
12128a6226 Task # 186 : Stock calculation on product, migration + update product 2012-10-04 15:25:34 +02:00
Laurent Destailleur
bdb7becbc6 Fix: Try another fix on getTrad bug. 2012-10-04 09:44:04 +02:00
Laurent Destailleur
4b27a9215b Fix: Show message only when needed 2012-10-03 23:15:57 +02:00
Laurent Destailleur
59a33db53d Fix: Add warning to ask refresh. 2012-10-03 20:10:29 +02:00
Laurent Destailleur
1f2b05fbc0 Fix: Can unset ChromePHP output 2012-10-03 18:40:24 +02:00
Laurent Destailleur
fa016baa7e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-03 17:48:09 +02:00
Laurent Destailleur
2159848490 Fix: getTradFromKey 2012-10-03 17:47:53 +02:00
Laurent Destailleur
315670273d Merge pull request #434 from grandoc/develop 
try to fix canvas issue
 2012-10-03 06:16:35 -07:00
Laurent Destailleur
a821d6cafe Fix: We use dolibarr_details as type of DolEditor here, because we 
must not accept images as description is included into PDF and not
accepted by TCPDF.
 2012-10-03 14:52:01 +02:00
Laurent Destailleur
1d9e77a53d Fix: We use dolibarr_details as type of DolEditor here, because we must 
not accept images as description is included into PDF and not accepted
by TCPDF.
 2012-10-03 14:49:51 +02:00
Laurent Destailleur
0f78ffda5c New: POS module can works with only one payment method (cach, chq, 
credit card).
 2012-10-03 14:45:58 +02:00
Grand Philippe
fb487ff855 try to fix canvas issue 2012-10-03 14:20:04 +02:00
Laurent Destailleur
61958f445d Fix translation 2012-10-03 14:15:07 +02:00
Laurent Destailleur
3bd20ee8ba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-03 13:04:29 +02:00
Laurent Destailleur
6d8ea8dcd5 Update trans 2012-10-03 13:04:18 +02:00
Regis Houssin
4ed05b5b2e Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-03 12:41:02 +02:00
Regis Houssin
935bb09b99 Fix: better translation 2012-10-03 12:39:48 +02:00
Laurent Destailleur
c69e1af7db Update changelog 2012-10-03 11:54:23 +02:00