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

304 Commits

Author SHA1 Message Date
Laurent Destailleur
2c40e4be94 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-15 20:13:45 +01:00
Laurent Destailleur
ce2b0b9cad Trans 2020-01-15 13:51:06 +01:00
Laurent Destailleur
18324962c5 Better help 2020-01-15 13:41:07 +01:00
Laurent Destailleur
a6bae97826 Sync from transifex 2020-01-12 21:28:09 +01:00
Laurent Destailleur
89ab80e598 Fix typo 2020-01-10 14:41:58 +01:00
VESSILLER
0396b348f7 NEW add weighted amount on project/opportunity 2019-12-10 09:32:37 +01:00
Laurent Destailleur
93d66d8213 Debug v11 2019-12-06 08:50:26 +01:00
Laurent Destailleur
48fc165026 Trans 2019-09-30 17:15:05 +02:00
Laurent Destailleur
d2131a0be8 Add filter on usage on project list 2019-09-09 14:08:10 +02:00
ATM john
f10f29f632 Add filters 2019-08-12 01:01:16 +02:00
ATM john
09c1289802 Fix task widget and improve its display 2019-08-10 22:48:07 +02:00
ATM john
3f0f7e2ad5 Add progress bar for task list and visual status badges 2019-08-10 15:41:21 +02:00
Laurent Destailleur
91a4e8bc0a Merge 2019-06-12 12:09:56 +02:00
Laurent Destailleur
42fda54edf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/fichinter/list.php
	htdocs/product/stock/replenish.php
 2019-04-02 19:41:58 +02:00
Laurent Destailleur
ecc7afa4e3 Removed duplicate code 2019-03-29 15:27:00 +01:00
Laurent Destailleur
f1db09fc4f Shwo field time billed and not billed on list of tasks 2019-03-29 13:18:12 +01:00
Laurent Destailleur
aad3867b9b Fix translation 2019-03-26 14:00:01 +01:00
Laurent Destailleur
7d54c7a480 Fix translation 2019-03-22 14:38:06 +01:00
Laurent Destailleur
cd6a0bacdd Look and feel v10 2019-03-22 14:32:15 +01:00
Laurent Destailleur
98ca9bf17a Reduce quantity of string to translates 2019-03-12 19:44:59 +01:00
Laurent Destailleur
48ab519841 Fix typo 2019-02-03 21:40:56 +01:00
Laurent Destailleur
5a6e46a9c3 Doc 2019-02-03 21:40:23 +01:00
Laurent Destailleur
28c1b1ce58 Work on billing time spent 2019-02-01 22:39:36 +01:00
Laurent Destailleur
cfa850cd20 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-26 01:32:00 +01:00
Laurent Destailleur
2c8557e2e0 Work on invoicing of time spent 2019-01-24 18:16:14 +01:00
Laurent Destailleur
c95b915db3 Merge branch '9.0' of github.com:Dolibarr/dolibarr into 9.0 2019-01-24 07:07:31 +01:00
Laurent Destailleur
ecb16cf914 Trans 2019-01-24 07:07:26 +01:00
Laurent Destailleur
d6b0f852c5 Work on invoicing time spent 2019-01-15 21:01:01 +01:00
Laurent Destailleur
653acf556b Fix translation Customer order into Sales order 2019-01-10 12:15:42 +01:00
torvista
9f9a468f6a more fine tuning 2018-12-19 16:22:27 +01:00
Laurent Destailleur
699dc239d4 Fix US trans 2018-12-15 12:24:14 +01:00
Laurent Destailleur
69c666162f
Update projects.lang 2018-12-15 12:13:54 +01:00
torvista
6f5f4bd3de added latest Develop edits 2018-12-14 20:33:07 +01:00
torvista
805c184163 more supplier->vendor found! 
use of e-mail, EMail, Email rationalised
grammar changes for module titles and descriptions
added constants for Stripe to admin to override class constants
 2018-12-14 20:17:22 +01:00
Laurent Destailleur
9e83699193
Merge branch 'develop' into new_branch_31_10_2018 2018-12-14 14:27:35 +01:00
Laurent Destailleur
55487da03e
Merge branch 'develop' into langs_en_US 2018-12-14 11:09:25 +01:00
torvista
351274d85d 1) Standardization of use of "third party" 
as a noun : third party
as an modifier: third-party contact
2) use of colons: no space before
3) Use of supplier/vendor was mixed.
Vendor is B2B or B2C, supplier is B2B. Changed all references to supplier.
4) Many minor grammar changes.
 2018-12-11 10:08:19 +01:00
Laurent Destailleur
434cf2e046 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-11 09:58:14 +01:00
Laurent Destailleur
dbee87aa9d Trans 2018-12-10 13:10:28 +01:00
Laurent Destailleur
2621af96d6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/install/upgrade2.php
 2018-12-07 19:08:53 +01:00
Laurent Destailleur
a9a191819f Work on billing time spent 2018-12-06 21:25:28 +01:00
Laurent Destailleur
163cac5349 Trans lead 2018-12-06 20:25:22 +01:00
Laurent Destailleur
7d5c9959bc Close #9978 
Better way to address the feature. Work in most cases, need less code
and less sql access.
 2018-11-15 18:20:38 +01:00
Philippe GRAND
fe6b185bf1 Typo 2018-10-31 10:32:40 +01:00
Laurent Destailleur
d3893b8b95 Debug v9 2018-10-26 19:00:24 +02:00
Laurent Destailleur
0ba86d4e5b Trans 2018-10-26 12:22:31 +02:00
Laurent Destailleur
8a928a72fa Sync transifex 2018-10-13 14:03:32 +02:00
Laurent Destailleur
771922f427 Use 2 distinct left menu entries for leads and projects 2018-10-01 18:56:47 +02:00
Laurent Destailleur
26d34422b0 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-19 03:01:26 +02:00
Laurent Destailleur
cca0f4bf22 Fix translation 2018-08-19 02:01:18 +02:00
Laurent Destailleur
38f3452f0c Fix trans 2018-08-19 01:51:45 +02:00
Alexandre SPANGARO
0509a176ca
Merge branch 'develop' into 9.0_a3 2018-07-31 07:47:43 +02:00
Alexandre SPANGARO
b0e2e69ed0 New : Add project on salaries 2018-07-31 07:45:03 +02:00
Steve
2cf28e055b more minor grammar corrections 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/langs/en_US/companies.lang
	htdocs/langs/en_US/exports.lang
	htdocs/langs/en_US/mails.lang
	htdocs/langs/en_US/products.lang
	htdocs/langs/en_US/sms.lang
 2018-07-16 09:43:19 +02:00
Steve
bd9149e03b more minor grammar corrections 2018-07-16 07:28:22 +02:00
Laurent Destailleur
5cff4c152b Add tab "time spent" in project view. Can swith gantt/list. 2018-05-04 11:25:21 +02:00
Laurent Destailleur
bf1e3705fb Fix english 2018-04-11 12:47:10 +02:00
Marc de Lima Lucio
9ba902504e FIX: langs 2018-03-29 09:38:16 +02:00
Laurent Destailleur
9980a5fbd0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2018-03-22 14:08:43 +01:00
Laurent Destailleur
658b145ff4 Missing translation 2018-03-22 13:16:38 +01:00
Laurent Destailleur
68a4058387 Fix translation 2018-03-22 13:03:12 +01:00
philippe-opendsi
452c9e22bb Add mass action on project's list to close projects 2018-03-16 15:24:49 +01:00
Laurent Destailleur
01b0336e9b Fix tooltip on delete button 2018-03-03 12:10:27 +01:00
Laurent Destailleur
82475e2e5f WIP Option PROJECT_BILL_TIME_SPENT 2018-02-26 14:28:51 +01:00
Laurent Destailleur
46c2f098e0 NEW Can enter time spent from the list of time spent of project 2018-02-26 12:21:01 +01:00
Laurent Destailleur
e984d7df9f NEW Add total of time spent in timespent page at top of page too. 2018-02-09 23:52:43 +01:00
Laurent Destailleur
9962d36dbc Fix translation 2018-02-06 18:39:11 +01:00
Laurent Destailleur
ebdbddb7fd Fix error message and migration 2017-12-15 19:50:39 +01:00
Laurent Destailleur
9314dcb046 Fix regression 2017-12-12 10:13:48 +01:00
ATM-Nicolas
bdf1e30ef3
Merge branch 'develop' into 6.0_fix_project_conf 2017-12-05 12:20:48 +01:00
ATM-Nicolas
36bcd26e27 FIX : link project from other company conf 2017-12-05 09:21:24 +01:00
Laurent Destailleur
5fa8db1650 Work on timesheets 2017-11-22 21:19:40 +01:00
Laurent Destailleur
ba372bfc5c Fix typo 2017-11-16 23:11:49 +01:00
Laurent Destailleur
e06087888b NEW Show line "other filtered task" when using filter on timesheet. 2017-11-16 22:55:04 +01:00
Laurent Destailleur
0d192df1fd Standardize interface 2017-11-16 18:33:56 +01:00
Laurent Destailleur
5b70468cac Better translation 2017-10-20 04:25:49 +02:00
Laurent Destailleur
a16f0e4356 NEW The gantt diagram is now sensitive to hours 
NEW Add a group task line for tasks on same level on gantt diagram
 2017-10-20 04:15:44 +02:00
Laurent Destailleur
abd5251330 Better responsive 2017-10-19 19:53:29 +02:00
arnaud
9795f48046 NEW comment system working with all objects 2017-09-18 17:27:29 +02:00
Laurent Destailleur
2f80618545 Merge pull request #7390 from atm-arnaud/FIX_task_comment_design 
Fix task comment design
 2017-09-14 12:21:58 +02:00
arnaud
ad017495f4 FIX task comment design 2017-09-13 12:09:01 +02:00
Laurent Destailleur
3d4134df7a Translation 2017-09-12 14:39:20 +02:00
arnaud
8906c95eea NEW comments system on task 2017-09-07 16:23:51 +02:00
Alexandre SPANGARO
84fcbb724e Add project on various_payment 2017-09-01 07:21:27 +02:00
Laurent Destailleur
d8ead2693f Fix field position 2017-08-24 17:59:20 +02:00
Laurent Destailleur
ecb4eebfac Fix filter of project in timespent view 2017-07-31 06:58:55 +02:00
Laurent Destailleur
c0f46834cb Fix demo links 2017-06-13 13:22:05 +02:00
Laurent Destailleur
1761df2bc2 NEW Add page statistics for project tasks 2017-06-02 19:28:22 +02:00
Laurent Destailleur
c59d216cf5 NEW Can read time spent of others (hierarchy only or all if granted) 2017-06-02 13:24:45 +02:00
Laurent Destailleur
5c58ed8ca7 Add a better error message when payment link is not valid. 2017-06-02 09:13:04 +02:00
absnc
7b784a1dcb Enable shipments for project overview tab 2017-05-19 17:50:10 +11:00
Laurent Destailleur
759315aef5 NEW Mass action delete available on project and tasks 2017-04-11 02:48:16 +02:00
Laurent Destailleur
3cc312d485 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/main.lang
 2017-03-23 19:48:34 +01:00
Laurent Destailleur
c4b6378751 Fix english translation 2017-03-23 16:46:00 +01:00
Laurent Destailleur
ec7d48931e Merge duplicate menus/page on projects 2017-03-14 13:49:04 +01:00
Laurent Destailleur
6b528b2bea Fix translation: Open -> opened (open is for "mind/spirit", opened is 
the adjective for a status)
 2017-02-06 21:34:05 +01:00
Laurent Destailleur
9a9b31c9c0 Fix cancel button + logic to close project when setting opp to WON/LOST. 2017-02-01 13:25:16 +01:00
Laurent Destailleur
fbf9986506 Fix translation 2017-01-31 18:03:25 +01:00
Laurent Destailleur
064f38b89e Fix condition to show time spent on project overview 2017-01-02 12:17:27 +01:00
Laurent Destailleur
83972b39ce Complete work on dol_banner. Fix errors due to missing columns. 2016-11-28 23:58:36 +01:00