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

3510 Commits

Author SHA1 Message Date
Raphaël Doursenaud
f01e76f686 Removed unmaintaned OScommerce module 2014-09-29 15:22:48 +02:00
Laurent Destailleur
aba4c90d2b Trans 2014-09-23 11:23:57 +02:00
Laurent Destailleur
d0da5ef047 Merge pull request #1910 from FHenry/develop 
Better accountancy auto find accountancy code feature (work with several
 2014-09-22 23:48:32 +02:00
aspangaro
e147259e95 Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6 2014-09-21 20:30:55 +02:00
Florian HENRY
119be5da42 Better ressource management on project and task 2014-09-20 10:14:26 +02:00
Laurent Destailleur
2b69358c9c Merge pull request #1896 from FHenry/develop 
Add Dunning into accountancy report
 2014-09-18 17:48:40 +02:00
Laurent Destailleur
99f1876aa2 Merge pull request #1903 from aspangaro/develop-accounting 
Patch Accounting Expert module
 2014-09-18 17:24:40 +02:00
Laurent Destailleur
9666d5e3ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/.gitignore
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
 2014-09-18 10:17:43 +02:00
Juanjo Menent
039105a3f1 Fix: Invoices payments may be older than invoices. fr and es trans 2014-09-18 10:02:03 +02:00
Laurent Destailleur
fac24889f6 Sync french 2014-09-18 01:19:46 +02:00
aspangaro
5216bbca72 Traduce button 2014-09-16 21:31:58 +02:00
Florian HENRY
bb612d24db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
	htdocs/compta/resultat/clientfourn.php
	htdocs/compta/resultat/index.php
 2014-09-16 21:09:53 +02:00
Florian HENRY
14ab058f34 Add Dunning into compta report 2014-09-16 21:05:57 +02:00
Laurent Destailleur
0d6d064e7e New: PDF event report show project and status of event 
Fix: Can edit description of intervention
New: Show status of object on refere page.
 2014-09-15 12:48:24 +02:00
Laurent Destailleur
17f1638ec2 Sync from transifex 2014-09-15 09:11:16 +02:00
aspangaro
7cc3fe9c95 Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-09-09 20:41:19 +02:00
Laurent Destailleur
9f2b0b4f29 Minor enhancement on agenda module. 
Can filter on date of event.
Local calendar renamed into Internal calendar.
 2014-09-09 12:28:35 +02:00
aspangaro
289f46977b List financial journals into admin 2014-09-08 21:19:05 +02:00
aspangaro
70b8ccd441 Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-09-08 20:18:45 +02:00
Laurent Destailleur
2f6493dabd Sync transifex 2014-09-08 11:58:45 +02:00
Laurent Destailleur
b63cfccf49 On peruser agenda view, use different color if event is busy or not for 
user.
 2014-09-08 10:24:16 +02:00
Laurent Destailleur
342e26f679 Merge 2014-09-07 12:22:04 +02:00
aspangaro
02f45b7f43 Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-09-07 07:32:47 +02:00
aspangaro
f9dc25cf3f Patch Accounting Expert Module 2014-09-06 09:50:42 +02:00
Juanjo Menent
04c2c4379a Merge pull request #1855 from grandoc/develop 
add product minimum recommended price
 2014-09-05 09:34:58 +02:00
aspangaro
18a6a3f499 Update langs - Tks Juanjo for es_ES 2014-08-31 13:57:30 +02:00
jfefe
b7a2e3783e Fix : missing translations 2014-08-30 11:11:51 +02:00
Philippe GRAND
a448b7e36a add product minimum recommended price 2014-08-29 19:19:26 +02:00
aspangaro
d03763f6c3 Update Accounting Expert integration 2014-08-28 06:30:01 +02:00
aspangaro
71265558d2 Integrate module Accounting Expert 2014-08-27 07:03:42 +02:00
Laurent Destailleur
eb3c53d897 Merge pull request #1823 from Devensys/Develop-removeVersion 
Hidden version on login page
 2014-08-21 23:24:08 +02:00
Andrelec1
1ffb964dd1 Change method 
Replace by existing constant ..
 2014-08-14 16:06:43 +02:00
Laurent Destailleur
d6c4993c40 Merge pull request #1822 from Devensys/Devlop-PayTotalButton 
Add button to fill amount paiement
 2014-08-14 01:28:20 +02:00
Laurent Destailleur
cc86e280f9 Merge branch 'task712' of github.com:KreizIT/dolibarr into 
KreizIT-task712

Conflicts:
	ChangeLog
 2014-08-14 00:18:51 +02:00
Laurent Destailleur
98f140962a Merge remote-tracking branch 'origin/3.6' into develop 2014-08-13 19:25:55 +02:00
Andrelec1
8b6d613cb0 Hidde version on login page 
Create option and use it in login template
 2014-08-12 12:29:20 +02:00
Andrelec1
3548f72d8a Start implement 2014-08-11 18:14:40 +02:00
Laurent Destailleur
bd29d3c7f4 Sync from transifex 2014-08-08 14:38:20 +02:00
KreizIT
973d61fe13 [ task #712 ] Add warning when creating invoice from proposal or order, when there is already one invoice 2014-08-07 16:23:02 +02:00
Laurent Destailleur
f58da0fa73 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/langs/fr_FR/main.lang
 2014-08-01 02:05:38 +02:00
Laurent Destailleur
80e8ff8db3 Sync from transifex 2014-08-01 02:01:51 +02:00
frederic34
5239620356 Update main.lang 2014-07-23 10:02:33 +02:00
frederic34
a01c985018 Update main.lang 2014-07-21 19:21:08 +02:00
Laurent Destailleur
a6992e116b Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
 2014-07-18 23:24:39 +02:00
Laurent Destailleur
dbae31b982 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-07-18 20:17:18 +02:00
Laurent Destailleur
e94ffceac9 Transifex sync for 3.6 2014-07-18 20:16:46 +02:00
Cedric
769c9a9b66 FIX stock inconsistency when activating batch management on product which already have stock 2014-07-15 11:22:16 +02:00
aspangaro
46320071a0 Merge branch 'Upstream/develop' 2014-06-29 05:42:37 +02:00
aspangaro
8cfdfbe47d Update 2014-06-29 05:41:24 +02:00
Laurent Destailleur
a96655c363 Translation of juridical status for de_CH 2014-06-29 01:13:44 +02:00