Commit Graph

4292 Commits

Author SHA1 Message Date
Benlo
4ebd1ff8a2 Permit to print Total TTC price in objectline 2016-10-12 12:30:22 +02:00
Laurent Destailleur
92dc385307 Merge pull request #5838 from atm-gauthier/develop_NEW_filter_by_supplier_on_replenishment_card
Develop new filter by supplier on replenishment card
2016-10-11 20:04:02 +02:00
BENKE Charlie
9663883ae4 Unactive user place on bottom list
More usefull
2016-10-10 18:15:46 +02:00
Laurent Destailleur
6489cd6164 Debug accounting module 2016-10-07 12:10:16 +02:00
gauthier
fee0a88d27 Merge branch 'NEW_filter_by_supplier_on_replenishment_card' of github.com:atm-gauthier/dolibarr into develop_NEW_filter_by_supplier_on_replenishment_card 2016-10-07 09:25:18 +02:00
gauthier
18496f9159 FIX : params order 2016-10-07 09:19:10 +02:00
Laurent Destailleur
c908af6758 Merge pull request #5833 from atm-gauthier/develop_NEW_cdr_current_or_next_month
NEW Develop new cdr (current or next month) for payment terms.
2016-10-07 00:06:59 +02:00
Laurent Destailleur
db3e3642b0 NEW Can generate SEPA mandate for each bank account of your customers 2016-10-06 00:14:25 +02:00
Laurent Destailleur
e79a84a89b Uniformize code 2016-10-05 21:49:04 +02:00
gauthier
ee014681b0 Merge branch 'NEW_filter_by_supplier_on_replenishment_card' of github.com:atm-gauthier/dolibarr into develop_NEW_filter_by_supplier_on_replenishment_card 2016-10-05 15:30:23 +02:00
gauthier
9c8ecdc8d8 NEW : filter by supplier on replenish.php 2016-10-05 15:06:30 +02:00
Laurent Destailleur
9ec520a37a Fix link to on proposal 2016-10-04 20:52:15 +02:00
gauthier
b35a4eb1b2 Merge branch 'NEW_cdr_current_or_next_month' of github.com:atm-gauthier/dolibarr into develop_NEW_cdr_current_or_next_month 2016-10-04 16:01:26 +02:00
gauthier
1c98979ca1 NEW : option "Current/Next" for limit payment date (in payment terms) to use a specific day of current month or jump to same day of next month 2016-10-04 15:45:23 +02:00
Laurent Destailleur
b607fb6be2 Fix do not show link to for disabled modules 2016-10-04 12:52:00 +02:00
Laurent Destailleur
3599f2c840 Uniformize code for recurring invoices 2016-10-04 12:31:45 +02:00
Laurent Destailleur
e37e30cc39 Better responsive 2016-10-04 11:29:48 +02:00
Laurent Destailleur
7967c80179 Code comment 2016-10-03 12:16:32 +02:00
Laurent Destailleur
45a808e034 NEW Generation of document is available on member card 2016-10-03 00:08:47 +02:00
Laurent Destailleur
0d9f28bd61 Fix dash in incoterm label 2016-10-02 16:50:28 +02:00
Laurent Destailleur
f92ca518f7 Uniformize look and feel 2016-10-02 16:38:58 +02:00
Laurent Destailleur
2579cb35dd Minor fix 2016-10-02 11:03:36 +02:00
Laurent Destailleur
e62a12ebe9 Merge pull request #5817 from atm-arnaud/FIX_develop_maxwidthonsmartphone_on_extrafields
Fix Extrafields edit crashed by maxwidthonsmartphone ...
2016-10-01 18:59:37 +02:00
Laurent Destailleur
ee252f549a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	dev/skeletons/skeleton_list.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/lib/cron.lib.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
2016-10-01 18:42:50 +02:00
Laurent Destailleur
cf7327a2a2 FIX #5750 Bug: CmailFile::server_parse enters an infinite loop if
$server_response is false
2016-10-01 16:41:12 +02:00
arnaud
0bb7aaa62f Fix Extrafields edit crashed by maxwidthonsmartphone ... 2016-09-30 14:26:04 +02:00
Laurent Destailleur
5c9fa28e79 Fix search on invoice type 2016-09-29 10:38:15 +02:00
Laurent Destailleur
6232e59fd2 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-26 14:17:36 +02:00
Laurent Destailleur
fac946dbb8 FIX The email test sender in email setup was broken 2016-09-26 14:08:14 +02:00
Laurent Destailleur
48b188d200 Merge pull request #5785 from EuskalMoneta/rest-api-add-countries-and-towns
NEW Add Countries and Towns to the REST API.
2016-09-26 01:33:56 +02:00
Laurent Destailleur
100312aac2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/adherents/class/cotisation.class.php
2016-09-26 01:32:50 +02:00
Laurent Destailleur
ea09eb13da Uniformize code 2016-09-26 00:10:29 +02:00
Xebax
d5ee73a1b7 Add Countries to the REST API. 2016-09-25 17:43:15 +02:00
aspangaro
2dbeeedd14 Move tab menu for subscription in member.lib
Move all pages for subscription member in adherent/subscription (Card / Info / List)
Rename llx_cotisation in llx_subscription
Rename all db field cotisation in subscription
Rename class Cotisation in class Subscription
2016-09-24 06:48:40 +02:00
florian HENRY
984a56adc5 FIX : #5776 2016-09-23 10:51:31 +02:00
Laurent Destailleur
d4e324d15a Merge remote-tracking branch 'origin/4.0' into develop
Conflicts:
	htdocs/compta/facture.php
2016-09-21 18:38:30 +02:00
Laurent Destailleur
9c12444a03 Fix size of warehouse and height of confirm box 2016-09-21 18:20:18 +02:00
Laurent Destailleur
39c4feaef7 Enhancement for usage on smartphone 2016-09-21 03:54:54 +02:00
Laurent Destailleur
133657a8c7 Uniformize code 2016-09-21 01:25:34 +02:00
Laurent Destailleur
c4c7ccc226 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/societe/note.php
	htdocs/societe/rib.php
2016-09-19 14:05:16 +02:00
Laurent Destailleur
4f842fd2cb Uniformize look and feel 2016-09-19 13:57:50 +02:00
Laurent Destailleur
079ed88119 Fix missing css 2016-09-19 13:57:18 +02:00
Laurent Destailleur
af28a67803 Uniformize look using dol_banner 2016-09-19 10:43:30 +02:00
Laurent Destailleur
c8b8e13014 Work on dol_banner for proposals. 2016-09-18 21:38:20 +02:00
Laurent Destailleur
6093dfe333 Uniformize code 2016-09-18 12:33:30 +02:00
Laurent Destailleur
72aacb81ae NEW Can use native php and dolibarr object on pages of module website. 2016-09-16 01:13:52 +02:00
Laurent Destailleur
68b3de5b37 NEW ckeditor accept a parameter to disable all html filtering 2016-09-15 23:23:10 +02:00
Sergio Sanchis Climent
93b216e628 FIX: #5699 2016-09-15 05:18:08 +02:00
Laurent Destailleur
39d47eab18 NEW Introduce option MAIN_DEFAULT_PAYMENT_TERM_ID to set default payment
term on company level.
2016-09-14 11:17:44 +02:00
phf
0cf5ee2f28 Fix clone object with "link" as extrafield 2016-09-13 10:12:55 +02:00