Commit Graph

4175 Commits

Author SHA1 Message Date
Philippe GRAND
b4b3e33e3e Docs : update and complete comments 2018-07-09 17:22:34 +02:00
Laurent Destailleur
3cda462faf Merge pull request #9065 from aspangaro/9.0_a1
Add customer accountancy code on deposit slips export
2018-07-09 17:08:13 +02:00
Laurent Destailleur
f5d9403c7d Fix permission to see HR tab on user. All HR on same tabs. 2018-07-09 15:38:00 +02:00
Laurent Destailleur
ba6566867e Merge pull request #9064 from grandoc/new_branch_06_07_2018
fix : typo and update code
2018-07-09 15:33:25 +02:00
Philippe GRAND
2c4d7c4835 Docs : update and complete 2018-07-09 14:06:59 +02:00
Philippe GRAND
12d4880e7b Docs : update and complete 2018-07-09 10:08:27 +02:00
Philippe GRAND
47e80123d5 Docs : update code 2018-07-07 11:36:46 +02:00
Philippe GRAND
fe5bfe3aaf Docs : update comments 2018-07-07 10:51:09 +02:00
Philippe GRAND
1e1ed485f5 Docs : update comments 2018-07-07 10:47:56 +02:00
Alexandre SPANGARO
655d55eae6 Add customer accountancy code on deposit slips export 2018-07-07 02:46:56 +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
05ed721a8c Fix name of constant for module TICKET 2018-07-06 13:09:07 +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
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
Philippe GRAND
1cc73ae8ca docs: complete comments 2018-07-05 10:16:20 +02:00
Philippe GRAND
afd3868a8a docs: complete comments 2018-07-04 14:38:56 +02:00
Laurent Destailleur
38cd5180d9 FIX for migration from old versions 2018-07-03 20:11:59 +02:00
Laurent Destailleur
275f981545 FIX for migration from old versions 2018-07-03 20:08:55 +02:00
Laurent Destailleur
f7b8e09268 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.travis.yml
2018-07-03 13:53:34 +02:00
Laurent Destailleur
f93f5bd6e0 Fix travis 2018-07-03 13:49:41 +02:00
Laurent Destailleur
12c43d7722 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-03 12:33:17 +02:00
Laurent Destailleur
4e7f9b1b4d Merge pull request #9038 from hregis/8.0_multicompany
Fix: possibility to overload permissions (multicompany sharing)
2018-07-02 16:12:40 +02:00
Philippe GRAND
0aa58537bb update code comment 2018-07-02 15:07:00 +02:00
Philippe GRAND
74c45fa876 update code comment 2018-07-02 14:30:30 +02:00
Philippe GRAND
f43cce34c8 update code comment 2018-07-02 13:34:21 +02:00
Philippe GRAND
8497f56a04 update description code 2018-07-02 12:35:06 +02:00
Laurent Destailleur
9c5d34fc5f Fix translation 2018-07-02 12:26:32 +02:00
Laurent Destailleur
a2c89d8110 Fix page code in pdf 2018-07-02 12:25:09 +02:00
Laurent Destailleur
63f3143718 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-02 12:18:34 +02:00
Laurent Destailleur
7bf33b1bac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/hrm/index.php
	htdocs/install/mysql/tables/llx_website_account.key.sql
	htdocs/modulebuilder/template/myobject_card.php
2018-07-02 12:16:51 +02:00
Laurent Destailleur
11021353da Fix text in payment area of crabe pdf 2018-07-02 11:33:33 +02:00
Laurent Destailleur
93184c5f66 Fix travis 2018-07-01 23:57:54 +02:00
Regis Houssin
05c666c18b Fix: use numbering model corresponding to the entity of the object 2018-07-01 17:06:19 +02:00
Regis Houssin
80adac12c0 Fix: use object entity ID instead current entity 2018-07-01 16:01:30 +02:00
Laurent Destailleur
e06eb9e2fc Fix phpcs 2018-06-30 18:38:23 +02:00
Laurent Destailleur
751ddb46d2 Update pdf_blochet.class.php 2018-06-30 18:31:32 +02:00
Philippe GRAND
640f7697e4 update code 2018-06-30 11:45:49 +02:00
Laurent Destailleur
df96c5ca81 Merge pull request #8796 from defrance/patch-113
introduce serial and document for holiday module
2018-06-30 02:09:28 +02:00
Laurent Destailleur
e4388e63fa Merge pull request #8891 from inoveaconseil/develop
NEW: ADD url to see the last version of a external module
2018-06-30 01:17:10 +02:00
John
008163628a New pdf documents using new column system 2018-06-26 08:03:25 +02:00
Laurent Destailleur
2649c136cf Fix SYSLOG_FILE_ONEPERSESSION 2018-06-24 14:31:03 +02:00
Laurent Destailleur
848c8cdc4b Fix mode SYSLOG_FILE_ONEPERSESSION to work as expected 2018-06-24 13:59:37 +02:00
Laurent Destailleur
1b5c5cfafb Fix select status 2018-06-24 10:42:07 +02:00
Laurent Destailleur
c405181393 Merge pull request #8987 from a-schild/develop
Added mailing by thirdparty filtering by prospect type and status
2018-06-24 10:31:09 +02:00
Marc de Lima Lucio
dc951029cd Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_pdf_note_incoterm 2018-06-20 10:31:35 +02:00
Marc de Lima Lucio
babc99465c FIX PR #8841 2018-06-20 10:22:43 +02:00
Marc de Lima Lucio
9fa9a716d5 FIX: pdf: overlap when linked elements and incoterms/public note displayed + port PR #8155 into supplier docs & contracts 2018-06-20 10:22:43 +02:00