Commit Graph

58671 Commits

Author SHA1 Message Date
mikee2
c82ee862af Merge pull request #1 from mikee2/mikee2-odtphp-patch-1
Update Segment.php
2017-04-09 21:59:20 +02:00
mikee2
f460d2e705 Update Segment.php 2017-04-09 21:39:15 +02:00
Laurent Destailleur
b054ca8267 NEW Introduce mass action on product list ('delete' for the moment) 2017-04-09 15:02:55 +02:00
Laurent Destailleur
0a47245ba5 NEW Add mass actions (pdf merge and delete) for interventions 2017-04-09 14:31:56 +02:00
Laurent Destailleur
ddd101757e FIX Bulk pdf merge on supplier proposals 2017-04-09 13:26:26 +02:00
Laurent Destailleur
52c86cb3f5 NEW Bulk actions available on supplier orders 2017-04-09 13:12:25 +02:00
Laurent Destailleur
bb7c164752 Work on page to set/edit default values 2017-04-08 14:18:10 +02:00
Laurent Destailleur
76af83ce06 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-04-08 14:06:25 +02:00
Laurent Destailleur
56a4b7a1fd Work on v6 look and feel 2017-04-08 14:03:38 +02:00
Laurent Destailleur
7f7ba6279a Fix translation 2017-04-08 14:02:07 +02:00
Laurent Destailleur
31f580ad93 FIX Enter a direct bank transaction 2017-04-08 01:25:52 +02:00
Laurent Destailleur
669a04e304 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-04-07 18:39:10 +02:00
Laurent Destailleur
a0e75d0af0 Work on look and feel v6 2017-04-07 18:38:55 +02:00
Laurent Destailleur
1ab3086fca Work on website module 2017-04-07 16:44:43 +02:00
Laurent Destailleur
be439f6252 Work on look and feel v6 2017-04-07 16:16:44 +02:00
Laurent Destailleur
60a54041c2 NEW Enable bulk actions delete on supplier invoices 2017-04-07 14:09:19 +02:00
Laurent Destailleur
aa47575b13 Serious debug of variant module. No more fu.. js errors on smarpthone. 2017-04-07 12:31:08 +02:00
Laurent Destailleur
5ab8704aee Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-04-07 11:03:44 +02:00
Laurent Destailleur
ea44e14b60 Start debug the variant module 2017-04-07 11:01:12 +02:00
Laurent Destailleur
248150dd41 Merge pull request #6639 from WideeFr/patch-1
FIX Avoid (DEPOSIT) (1) & (2) descriptions
2017-04-06 23:33:03 +02:00
Laurent Destailleur
12375be14a Merge pull request #6593 from dolibarr95/patch-5
NEW : Create a trigger for company rib update
2017-04-06 23:29:06 +02:00
Laurent Destailleur
216bce608d Work on v6 look and feel 2017-04-06 23:28:06 +02:00
Laurent Destailleur
915a74a85f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-04-06 22:32:05 +02:00
Laurent Destailleur
a99a4be9e0 Work on 6.0 look and feel 2017-04-06 22:31:45 +02:00
Laurent Destailleur
07bbf1a32b Merge pull request #6648 from delcroip/patch-9
NEW : show files in the bank statement + download
2017-04-06 22:31:19 +02:00
Laurent Destailleur
87368908f6 Merge pull request #6646 from laudeco/feature/expense_report_paid
NEW mark expense report as paid if payement set the remaining sold to 0
2017-04-06 22:01:28 +02:00
Laurent Destailleur
a61543dedc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-04-06 21:59:41 +02:00
Laurent Destailleur
f598bf8bef Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2017-04-06 21:59:11 +02:00
Laurent Destailleur
8363bee234 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/filefunc.inc.php
2017-04-06 21:56:48 +02:00
Laurent Destailleur
fe4f71296f FIX #6636 Complete fix 2017-04-06 21:55:23 +02:00
Laurent Destailleur
e2ea5945dd Work on look and feel v6 2017-04-06 21:48:28 +02:00
Laurent Destailleur
5d099d24ee Merge pull request #6636 from defrance/patch-3
FIX : Categories Bank vs categories transactions
2017-04-06 21:48:14 +02:00
Laurent Destailleur
8cb28b7bfa Merge pull request #6638 from delcroip/patch-7
FIX: Supplier is not the project customer
2017-04-06 21:24:01 +02:00
Laurent Destailleur
18fc5bec9b Better log 2017-04-06 10:56:37 +02:00
delcroix Patrick
337eac30c1 Update releve.php 2017-04-05 21:14:41 +02:00
delcroix Patrick
ca72e5e19f NEW : download button 2017-04-05 20:53:41 +02:00
delcroix Patrick
dae0828543 NEW : show files in the bank statement + download 2017-04-05 20:50:18 +02:00
De Coninck Laurent
ae2e40e5e7 mark expense report as paid if payement set the remaining sold to 0 2017-04-05 19:06:21 +02:00
Laurent Destailleur
dc14268ac6 FIX complete hourly rate when not defined into table of time spent 2017-04-05 15:24:41 +02:00
Laurent Destailleur
e2b96abd0b Fix translation 2017-04-05 13:34:52 +02:00
Laurent Destailleur
1dc2cae3a5 NEW Show company into combo list of projects 2017-04-05 11:51:55 +02:00
Laurent Destailleur
a6c60e4a9a FIX shared bank account with multicompany not visible in invoice setup 2017-04-05 11:14:02 +02:00
Laurent Destailleur
7c868888a5 FIX Add option MAIN_MAIL_USE_MULTI_PART to include text content into
HTML email and add option MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS to
restore the inline images feature.
2017-04-05 01:02:03 +02:00
Laurent Destailleur
13333ffd73 Add multipart text version into html emails. 2017-04-05 00:39:32 +02:00
Laurent Destailleur
4f292d1247 Prepare 5.0.2 2017-04-04 13:01:53 +02:00
Laurent Destailleur
01d69e4b58 NEW Better reponsive design 2017-04-04 12:55:54 +02:00
Laurent Destailleur
c4d4856997 FIX sql errors on user card 2017-04-04 12:23:44 +02:00
Widee
89716a86a5 Avoid (DEPOSIT) (1) & (2) descriptions
When splitting a rebate into two parts, the word "DEPOSIT" is no longer translated on the invoices.
2017-04-04 12:22:51 +02:00
Laurent Destailleur
9df4bac202 NEW Bookmarks are into a combo list. 2017-04-04 11:56:19 +02:00
delcroix Patrick
422bdd1ef6 FIX: Supplier is not the project customer 2017-04-04 09:06:29 +02:00