Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
54,329 Commits 36 Branches 189 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

4492 Commits

Author SHA1 Message Date
Laurent Destailleur
83447243ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	build/debian/get-orig-source.sh
	htdocs/product/class/product.class.php
	htdocs/societe/soc.php
 2014-09-15 22:58:39 +02:00
Laurent Destailleur
9c70c2c3d0 Fix: cents for indian ruppes are calle paisa and paise. 2014-09-15 22:43:49 +02:00
Laurent Destailleur
9ea3e33f94 Fix: Can edit status of event. 
New: Onto event summary of elements, end date and status are visible.
 2014-09-15 19:04:30 +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
23eee1b83a New: Add hourly and daily amount on user card. Add weekly working hours 
and salary on user card.
 2014-09-13 17:41:26 +02:00
aspangaro
4c52a6ee6f Add admin page into salaries to manage accountancy 2014-09-10 04:53:18 +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
1223be1e5b Move language key into admin.lang file 2014-09-08 21:51:40 +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
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
Laurent Destailleur
bc7d839c64 Fix: Missing status "refunded". 
Fix: translation
 2014-09-06 17:16:24 +02:00
aspangaro
f9dc25cf3f Patch Accounting Expert Module 2014-09-06 09:50:42 +02:00
Laurent Destailleur
7bbeca147b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-05 21:12:22 +02:00
Laurent Destailleur
175e3eca6b Work on agenda view per user 2014-09-05 13:48:55 +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
Laurent Destailleur
a93ad958ac New: Add help info of field type into dictionary of payment types. 2014-09-05 09:33:12 +02:00
Laurent Destailleur
5aaba31c6a Fix: Missing translation string 2014-09-04 14:38:02 +02:00
Laurent Destailleur
80968bc087 Merge pull request #1857 from aternatik/resource-fix 
Fixes for resource module
 2014-09-02 19:35:06 +02:00
aspangaro
18a6a3f499 Update langs - Tks Juanjo for es_ES 2014-08-31 13:57:30 +02:00
aspangaro
9f92446dba Merge branch 'Upstream/develop' 2014-08-31 07:44:46 +02:00
Laurent Destailleur
f64cb085a7 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-08-30 18:27:34 +02:00
jfefe
b7a2e3783e Fix : missing translations 2014-08-30 11:11:51 +02:00
aspangaro
07377e7156 Merge branch 'Upstream/develop' 2014-08-30 04:42:36 +02:00
Laurent Destailleur
47339d0e62 Fix: Missing field tobuy into service export. 
Fix: Filter on date into export.
Fix: Tooltip help.
 2014-08-29 20:26:27 +02:00
Laurent Destailleur
5dc35ec137 Fix: Missing field tobuy into service export. 
Fix: Filter on date into export.
Fix: Tooltip help.
 2014-08-29 20:25:54 +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
Philippe GRAND
61ae2f3f37 fix : missing translation 2014-08-27 11:34:24 +02:00
aspangaro
71265558d2 Integrate module Accounting Expert 2014-08-27 07:03:42 +02:00
Laurent Destailleur
7cb283d0ea Prepare code to be able to choose what to show into footer 2014-08-25 19:16:37 +02:00
Laurent Destailleur
e3fede595f Removed all triggers _BUILDOC. Building a document is not a business 
status change but a technical action. So hooks must be used instead.


Merge branch '3.6-patch' of github.com:aspangaro/dolibarr into
aspangaro-3.6-patch

Conflicts:
	htdocs/core/modules/project/modules_project.php
	htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
 2014-08-22 00:01:53 +02:00
Laurent Destailleur
f7e0ef74d7 Bad translation 2014-08-17 20:05:48 +02:00
Laurent Destailleur
3e9ddbfcd0 Fix: [ bug #1547 ] Untranslated Paiementfourn.class.php error messages 2014-08-17 00:38:09 +02:00
Laurent Destailleur
3f4978d786 Fix: Translation 2014-08-15 23:34:48 +02:00
Laurent Destailleur
25cc27c857 Qual: Remove method SetBilled that is a duplicate of setStatus. 
Fix: Better management of option SendInterventionRef.
 2014-08-15 23:20:31 +02:00
Laurent Destailleur
7edf2eacea New: Each user can include its own external ics calendar into dolibarr 
agenda view.
 2014-08-15 17:08:05 +02:00
Laurent Destailleur
32e7c91b2b New: Add key for translation of module accounting expert 2014-08-14 01:43:12 +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
06fcbe12a8 Add MAIN_DEFAULT_WORKING_DAYS and MAIN_DEFAULT_WORKING_HOURS into 
company setup.
 2014-08-08 10:44:10 +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
17aed0f360 Prepare to be able to send bcc according to email type. 2014-08-05 09:28:07 +02:00
Laurent Destailleur
7d3c266a1d Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/agenda_other.php
	htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
	htdocs/install/mysql/migration/repair.sql
 2014-08-04 00:02:00 +02:00
Laurent Destailleur
51f1577c84 Fix: Field for user into event is "owner". 2014-08-03 23:32:36 +02:00
Laurent Destailleur
42008ae8cb Fix: Bad translation 2014-08-03 11:35:35 +02:00
Laurent Destailleur
be76fd93fd New: Add user of creation and validation on invoice export 2014-08-01 22:24:25 +02:00
Laurent Destailleur
c895c892a5 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
 2014-07-29 01:17:00 +02:00