Commit Graph

68865 Commits

Author SHA1 Message Date
Philippe GRAND
1e1ed485f5 Docs : update comments 2018-07-07 10:47:56 +02:00
Regis Houssin
e8afd7e833 Fix: use "supplier" instead "reseller" 2018-07-07 08:48:26 +02:00
Regis Houssin
1522a5b22d Fix: differentiate customer prices from supplier prices sharing 2018-07-07 08:43:59 +02:00
Steve
5944c161bc spelling and some grammar corrections for installation texts en_US 2018-07-07 08:41:17 +02:00
Alexandre SPANGARO
655d55eae6 Add customer accountancy code on deposit slips export 2018-07-07 02:46:56 +02:00
Philippe GRAND
1e565486d8 fix : typo and update code 2018-07-06 19:17:11 +02:00
Laurent Destailleur
a62fd8ef84 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-06 16:10:45 +02:00
Laurent Destailleur
45d1a14c8e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-06 16:10:37 +02:00
Laurent Destailleur
4db7e04523 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/class/html.formactions.class.php
	htdocs/loan/index.php
2018-07-06 16:09:32 +02:00
Laurent Destailleur
997ae76899 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-07-06 16:06:27 +02:00
Laurent Destailleur
ed6ec8138d Fix filter on invoice status 2018-07-06 16:06:15 +02:00
Laurent Destailleur
2a676b414a Merge pull request #9024 from atm-maxime/fix_link_create_event
Fix link to create event had no socid if from thirdparty card
2018-07-06 14:26:38 +02:00
Laurent Destailleur
2113965b57 Update html.formactions.class.php 2018-07-06 14:26:21 +02:00
Laurent Destailleur
67a831ad5f Merge pull request #9045 from hregis/8.0_multicompany
Fix: check if multicompany object exists
2018-07-06 14:23:59 +02:00
Laurent Destailleur
2cdd9adc6e Merge pull request #9023 from atm-maxime/fix_stocklist
Fix filters not saved when ordering
2018-07-06 14:23:10 +02:00
Laurent Destailleur
a725ceaf42 Merge pull request #9049 from grandoc/new_branch_04_07_2018
docs: complete comments
2018-07-06 14:21:47 +02:00
Laurent Destailleur
05ed721a8c Fix name of constant for module TICKET 2018-07-06 13:09:07 +02:00
Laurent Destailleur
e61f0ef7e4 Merge pull request #9060 from atm-maxime/fix_mod_ticket
Fix mod ticket
2018-07-06 13:05:42 +02:00
Laurent Destailleur
303fb94acb Fix trans 2018-07-06 13:04:37 +02:00
Laurent Destailleur
3b8ecb18ab Merge pull request #9044 from hregis/7.0_loan
Fix: missing "paid" field
2018-07-06 13:03:37 +02:00
Laurent Destailleur
fb84211714 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-06 12:45:44 +02:00
Laurent Destailleur
6c5264fabb Fix label 2018-07-06 12:45:20 +02:00
Laurent Destailleur
653134e179 Fix changelog 2018-07-06 12:06:16 +02:00
Laurent Destailleur
bb79257827 Prepare Changelog 2018-07-06 12:00:12 +02:00
Inovea Conseil
7f137adef9 ADD check user's rights 2018-07-06 08:07:38 +02:00
Laurent Destailleur
af3ab84ebb Fix backward compatibility with old multicompany module 2018-07-05 22:15:55 +02:00
Inovea Conseil
5011f252c1 ADD check user's rights 2018-07-05 19:00:41 +02:00
Philippe GRAND
988130d2a1 docs: complete comments 2018-07-05 17:04:11 +02:00
Philippe GRAND
4cbe3a5bc7 docs: complete comments 2018-07-05 17:01:47 +02:00
Laurent Destailleur
b369585e61 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/product/stats/commande.php
	htdocs/product/stats/commande_fournisseur.php
	htdocs/product/stats/contrat.php
	htdocs/product/stats/facture.php
	htdocs/product/stats/facture_fournisseur.php
	htdocs/product/stats/propal.php
	htdocs/product/stats/supplier_proposal.php
2018-07-05 15:57:27 +02:00
Laurent Destailleur
0587e73272 FIX Pagination on related item pages 2018-07-05 15:53:28 +02:00
Maxime Kohlhaas
badcbd78d8 Rename ticketsup public directory 2018-07-05 15:20:38 +02:00
Maxime Kohlhaas
39f890d84a Fix TICKETSUP var name 2018-07-05 14:51:00 +02:00
Maxime Kohlhaas
74b9f87cab Fix ticket : missing file for numbering 2018-07-05 14:35:12 +02:00
BENKE Charlene
bfe7cd0d9f Update propal.class.php 2018-07-05 12:11:20 +02:00
BENKE Charlene
5a6cfd5efe Update commande.class.php 2018-07-05 12:08:59 +02:00
BENKE Charlene
9539adfffb Update index.php 2018-07-05 12:02:38 +02:00
BENKE Charlene
c169ff4b97 Update facture.class.php 2018-07-05 12:01:48 +02:00
BENKE Charlene
633bf3034f new add total price on dashboard 2018-07-05 11:52:58 +02:00
Inovea Conseil
30cff2bb36 ADD check user's rights 2018-07-05 11:52:41 +02:00
Laurent Destailleur
3a593f88f1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/upgrade2.php
2018-07-05 10:28:24 +02:00
Philippe GRAND
1cc73ae8ca docs: complete comments 2018-07-05 10:16:20 +02:00
Inovea Conseil
d8dd658ec1 Merge remote-tracking branch 'Dolibarr/develop' into develop 2018-07-05 09:26:09 +02:00
Inovea Conseil
d53f03b596 Update after comment 2018-07-05 09:14:36 +02:00
Laurent Destailleur
5883899bc7 Little debug of option WEBSITE_USE_WEBSITE_ACCOUNTS 2018-07-05 02:33:39 +02:00
Regis Houssin
d796199ed0 Fix: avoid warning with multicompany tranverse mode 2018-07-04 14:48:00 +02:00
Philippe GRAND
afd3868a8a docs: complete comments 2018-07-04 14:38:56 +02:00
Laurent Destailleur
9842978b85 Fix trim config values 2018-07-04 11:16:45 +02:00
Laurent Destailleur
91b7ee5fc2 NEW Add function isValidMXRecord 2018-07-04 11:07:28 +02:00
Laurent Destailleur
64e778a78f Fix pgsql migration 2018-07-04 10:26:25 +02:00