Commit Graph

59005 Commits

Author SHA1 Message Date
Laurent Destailleur
1c20bbb287 NEW Add index and constraints keys on supplier proposal detail table 2017-04-26 12:11:33 +02:00
Laurent Destailleur
aa4b967e17 FIX image of rss when link is relative
Fix regression after disabling constant init.
2017-04-26 11:46:12 +02:00
Laurent Destailleur
84e774ff32 Better translation 2017-04-25 12:57:20 +02:00
philippe grand
e2dbcb2b5a Update code using new css class 2017-04-25 11:59:18 +02:00
Laurent Destailleur
113d4d1665 FIX spaces not allowed into vat code 2017-04-25 10:29:13 +02:00
AlainRnet
d9cdaeb851 without html.formprojet.class.php called, not possible create invoice template
cf. https://github.com/Dolibarr/dolibarr/issues/6614
without this class AND module Projects disabled, it's not possible to create an invoice template. So I pulled out the call of the class from the condition.
2017-04-24 15:43:36 +02:00
Laurent Destailleur
10e2b128d1 Fix warning during install 2017-04-24 05:20:45 +02:00
Laurent Destailleur
65fec95458 Fix debian package 2017-04-24 04:17:59 +02:00
Laurent Destailleur
af56c85057 Fix perms on file 2017-04-24 03:11:19 +02:00
Laurent Destailleur
ec59f08e41 FIX extrafield css for boolean type 2017-04-24 00:46:27 +02:00
Laurent Destailleur
0080821dc5 Fix no invoice if not a customer 2017-04-23 16:05:54 +02:00
Laurent Destailleur
215ef30abe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-04-23 03:33:24 +02:00
Laurent Destailleur
fbdfbed02c Add code to prepare a generic payment solution 2017-04-23 03:01:09 +02:00
BENKE Charlie
1792ff2d3b oups inverted value 2017-04-21 09:41:08 +02:00
BENKE Charlie
b7f1e74f6f New SITUATION_DISPLAY_DIFF_ON_PDF feature
allow to display or 
the progress situation percent value
the diférential situation percent value
2017-04-20 10:27:44 +02:00
florian HENRY
78a886c206 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_importexport_ressources 2017-04-20 09:01:49 +02:00
Juanjo Menent
a19627956b Merge pull request #6724 from aspangaro/6.0-codecomptable
New : Add search of accountancy code in main thirdparty search
2017-04-19 16:17:27 +02:00
Juanjo Menent
4e2f4fd48b Merge pull request #6699 from grandoc/new_branch_12_04
Update code using new css class
2017-04-19 16:10:02 +02:00
Juanjo Menent
2e4e3737e8 Merge pull request #6691 from grandoc/testing
Update code using new css class
2017-04-19 16:08:44 +02:00
Juanjo Menent
236afacfed Merge pull request #6704 from grandoc/new_branch_13_04
Update code using new css class
2017-04-19 16:02:13 +02:00
florian HENRY
213e0d2870 fix travis 2017-04-19 14:49:12 +02:00
florian HENRY
10541e0c53 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_importexport_ressources 2017-04-19 14:48:06 +02:00
Philippe Grand
88f771a7f1 Merge branch 'develop' into new_branch_12_04 2017-04-19 11:49:26 +02:00
Philippe Grand
a88d6425d7 Merge branch 'develop' into new_branch_13_04 2017-04-19 11:38:28 +02:00
Philippe Grand
c18e7e8816 Merge branch 'develop' into testing 2017-04-19 11:27:36 +02:00
Philippe Grand
529ae1fa92 Update propal.class.php 2017-04-19 10:01:43 +02:00
Laurent Destailleur
cfc31e91e8 FIX overwrapping of weight/volume on rouget template 2017-04-18 18:13:43 +02:00
Laurent Destailleur
50210d0dd6 NEW Add tooltip help on shipment weight and volume calculation 2017-04-18 17:04:56 +02:00
Laurent Destailleur
d89a89f8ea Fix error message 2017-04-18 17:03:34 +02:00
David
8bb7f858d9 fix params order for tha addline() function
please check to last param "$request_data->fk_remise_except", I couldn't find a corresponding parameter name in the addline() function
2017-04-18 16:47:06 +02:00
florian HENRY
4efb1ba23a update credentials 2017-04-18 15:27:18 +02:00
florian HENRY
a52db08cd6 NEW : Add module resources import/export 2017-04-18 15:25:04 +02:00
Alexandre SPANGARO
04e119d7a6 New : Add search of accountancy code in main thirdparty search 2017-04-18 07:03:57 +02:00
Laurent Destailleur
3da0aea168 Prepare code to use different SMTP servers. 2017-04-18 01:39:06 +02:00
Laurent Destailleur
9456f7091e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-04-18 01:36:33 +02:00
Laurent Destailleur
82f9555c6b Translation 2017-04-18 01:35:58 +02:00
Laurent Destailleur
0994622bf8 NEW Can use translations into all substitutions (watermark, freetext...) 2017-04-17 23:54:09 +02:00
Laurent Destailleur
e97e202deb NEW Can import users 2017-04-17 04:22:53 +02:00
Juanjo Menent
1fd359d52d Merge pull request #6723 from rassakali/patch-3
Update /adherents/subscription/card.php
2017-04-16 14:14:12 +02:00
rassakali
e1ea6e2b53 Update card.php 2017-04-16 12:04:36 +02:00
Juanjo Menent
c8b0921c51 Merge pull request #6702 from joseplluis/patch-7
NEW Show local taxes in supplier facture list
2017-04-16 11:05:19 +02:00
Juanjo Menent
3308775c06 Merge pull request #6701 from joseplluis/patch-6
NEW Show local taxes in facture list
2017-04-16 11:03:59 +02:00
Juanjo Menent
f000ca23c3 Merge pull request #6721 from simnandez/5.0
FIX #6718 Bug: Discount amount is not locally formatted in CommonObject View
2017-04-16 10:45:55 +02:00
Juanjo Menent
f059ab0042 Merge pull request #6711 from atm-maxime/fix_stockmvt_origin
Fix : no origin on stock mvmt when order set back to draft
2017-04-16 10:31:45 +02:00
Juanjo Menent
2413c728a8 Merge pull request #6710 from atm-maxime/fix_bank_on_supp_pay
Fix : display bank on supplier payment as on customer payment
2017-04-16 10:29:25 +02:00
Juanjo Menent
2fb96c8817 Merge pull request #6708 from atm-florian/5.0_fixmissingaccountancy_mainmenu
fix :missing mainmenu and leftmenu into accoutancy menu descriptor
2017-04-16 10:22:03 +02:00
Juanjo Menent
00390bc8e4 Merge pull request #6705 from atm-florian/5.0
fix setEventMessages error insteads of errors
2017-04-16 10:19:19 +02:00
Juanjo Menent
006ad4cef8 FIX #6718 Bug: Discount amount is not locally formatted in CommonObject View 2017-04-15 20:04:45 +02:00
Laurent Destailleur
4c056d68d8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/dict.php
	htdocs/commande/list.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/bills.lang
	htdocs/societe/list.php
2017-04-15 17:02:05 +02:00
Laurent Destailleur
ac884ec463 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/install/repair.php
2017-04-15 16:28:08 +02:00