lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
68,346 Commits 43 Branches 150 Tags 886 MiB
75c968b4ae
Commit Graph

14408 Commits

Author SHA1 Message Date
Laurent Destailleur
4c52384609 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-16 14:48:42 +02:00
Laurent Destailleur
0c654bd452 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-08-16 14:47:56 +02:00
Laurent Destailleur
37ca3ff230 Fix separator 2018-08-14 20:51:24 +02:00
florian HENRY
20309665e6 fix : ODT project substitution 2018-08-14 10:45:08 +02:00
Laurent Destailleur
33f0172603 Fix select zip/town 2018-08-13 16:44:49 +02:00
Laurent Destailleur
d92096f74a Fix menu payment not required if only module bank on 2018-08-13 02:04:38 +02:00
Laurent Destailleur
31c42c9a32 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/societe/canvas/actions_card_common.class.php
 2018-08-13 01:23:03 +02:00
Laurent Destailleur
21555a7435 Fix firstname/lastname 2018-08-13 01:10:51 +02:00
Laurent Destailleur
0a1c6e7194 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-08-12 20:08:20 +02:00
Laurent Destailleur
2d571acc03 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/commande/list.php
 2018-08-12 19:25:44 +02:00
Laurent Destailleur
30b4d88428 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/product/reassort.php
	htdocs/societe/list.php
 2018-08-12 19:23:45 +02:00
Laurent Destailleur
be7a764de7
Merge pull request #9202 from atm-florian/7.0 
fix bad use of test_sql_and_script_inject return int not value tested
 2018-08-12 18:24:54 +02:00
Laurent Destailleur
56d8935976
Merge pull request #9181 from ATM-Nicolas/fix_dolGetFirstLastname 
FIX : Wrong position of firstname lastname
 2018-08-12 18:11:36 +02:00
Laurent Destailleur
6954ab00f9
Update functions.lib.php 2018-08-12 18:11:27 +02:00
Laurent Destailleur
3d4d42462c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-12 16:30:21 +02:00
Laurent Destailleur
12e21b4886 FIX update extrafields 2018-08-12 16:29:26 +02:00
gauthier
391230babc FIX : global $mysoc missing (to avoid php notice on lines 279, 280 & 281) 2018-08-10 15:39:49 +02:00
Laurent Destailleur
2dbb6e258b FIX Can filter on month in export of blockedlog 
FIX Fingerprint correct in popup
 2018-08-09 22:29:02 +02:00
florian HENRY
06189f8153 Merge branch '6.0' into 6.0_fhe 2018-08-09 18:31:59 +02:00
florian HENRY
9024ed9e61 Merge branch '7.0' into 7.0_fhe 2018-08-09 17:47:21 +02:00
Laurent Destailleur
8d54df4263 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2018-08-08 17:31:23 +02:00
Laurent Destailleur
d79778a67e Fix reponsive 2018-08-08 17:00:16 +02:00
Juanjo Menent
e2499392a9
Merge pull request #9215 from fmarcet/7.0 
Fix: Bad position when document have incoterms/notes
 2018-08-08 11:10:47 +02:00
Ferran Marcet
5ce31f65a4 Fix: Bad position when document have incoterms/notes 2018-08-07 11:40:11 +02:00
ATM-Nicolas
5b15e688af FIX : PHP warning, undefined index notnull 2018-08-07 09:38:18 +02:00
florian HENRY
0d85eb52c5 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0 2018-08-03 17:10:26 +02:00
florian HENRY
615ed11534 fix bad use of test_sql_and_script_inject return int not value tested 2018-08-03 17:09:58 +02:00
ATM-Nicolas
70adfb135d FIX : Missing behavior 2018-08-03 09:51:29 +02:00
ATM-Nicolas
f3090e4819 FIX : Wrong variable and trigger name 2018-08-02 16:05:54 +02:00
florian HENRY
ceb85cfa45 fix : odt project and task extrafields management 2018-07-31 17:29:08 +02:00
gauthier
cadf931e8d FIX : extrafieldkey 2018-07-31 15:02:51 +02:00
John BOTELLA
4ddca02bb9 fix situation line's total 2018-07-31 14:58:33 +02:00
ATM-Nicolas
b9a44fc76b FIX : Wrong position of firstname lastname 2018-07-31 12:15:18 +02:00
Laurent Destailleur
7af42c66cc Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/list.php
 2018-07-27 12:54:45 +02:00
Laurent Destailleur
83ae27d122 FIX Deletion of files in migration 2018-07-27 12:33:36 +02:00
Laurent Destailleur
7821e21e5b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-07-24 19:23:51 +02:00
Laurent Destailleur
d871b8964f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-07-24 19:23:40 +02:00
Laurent Destailleur
20f178fdfe Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/lib/functions.lib.php
 2018-07-24 19:22:00 +02:00
Laurent Destailleur
77c121b15c
Merge pull request #9099 from ATM-Nicolas/7.0 
NEW Set contactCivName substitution key
 2018-07-24 18:02:21 +02:00
Laurent Destailleur
3bdf7d411d
Merge pull request #9125 from atm-john/fix_php7_warning_mysql 
Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NU…
 2018-07-24 16:56:10 +02:00
Laurent Destailleur
8866b8eb1d
Merge pull request #9133 from frederic34/patch-12 
__NEXT_MONTH __PREVIOUS_MONTH give day instead month
 2018-07-24 16:54:04 +02:00
Frédéric FRANCE
4341e367d2
remove % in supplier order pdf 2018-07-23 10:30:28 +02:00
Frédéric FRANCE
d582f72bd9
__NEXT_MONTH __PREVIOUS_MONTH give day instead month 2018-07-22 17:27:02 +02:00
Laurent Destailleur
c4e207e8b7 Fix dol_string_onlythesehtmltags 2018-07-22 15:51:19 +02:00
Laurent Destailleur
1d8c42265c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/modFacture.class.php
 2018-07-21 20:26:19 +02:00
Laurent Destailleur
a1180f79bd Fix missing customer code and ref customer 2018-07-21 12:56:18 +02:00
John BOTELLA
1e986bc39a Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NUM' (this will throw an Error in a future version of PHP) 2018-07-20 11:51:01 +02:00
Laurent Destailleur
445db58966 FIX website in inline edit mode 2018-07-19 16:06:48 +02:00
Laurent Destailleur
efa5cdeab1 More complete list of allowed html tags 2018-07-19 15:24:48 +02:00
Laurent Destailleur
7fcec5f6c3 Fix duplicate tab "contact" on thirdparty 2018-07-17 13:54:13 +02:00
Laurent Destailleur
8249179fb8 Fix duplicate tab "contact" on thirdparty 2018-07-17 13:50:26 +02:00
Laurent Destailleur
f747cefda3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/install/upgrade2.php
 2018-07-16 15:44:44 +02:00
Laurent Destailleur
45a45b0dec NEW Can enable a module, even external module, from command line 
Conflicts:
	htdocs/install/upgrade2.php
 2018-07-16 15:35:00 +02:00
Laurent Destailleur
e92ab19a06 Fix var not defined 2018-07-16 11:26:23 +02:00
ATM-Nicolas
3c5998e697 FIX : Refactoring 2018-07-16 11:16:55 +02:00
Laurent Destailleur
d3cc2c81eb Better detail for time elapsed 2018-07-16 11:14:39 +02:00
Laurent Destailleur
89cc048fff FIX Init of contact in combo list when thirdparty not yet known 2018-07-16 10:46:10 +02:00
Laurent Destailleur
c94437c3cf Fix file in wrong dir 2018-07-16 10:14:51 +02:00
Laurent Destailleur
6846ff7d21 Fix problem in some vars as reported in #8955 2018-07-16 09:57:45 +02:00
ATM-Nicolas
9d60b0a8c6 Merge branch '7.0' of github.com:Dolibarr/dolibarr into 7.0 2018-07-16 09:47:16 +02:00
ATM-Nicolas
de8fd3d12c NEW : Contact substitutions keys 2018-07-16 09:33:14 +02:00
Laurent Destailleur
e92052353d
Merge pull request #9026 from inoveaconseil/FixExtrafieldResource 
Fix extrafields resource
 2018-07-15 20:13:24 +02:00
ATM-Nicolas
170a668b2b FIX : Set contactCivName substitution key 2018-07-13 11:09:56 +02:00
Laurent Destailleur
44626a3a48 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-07-10 13:57:24 +02:00
Laurent Destailleur
aeb5f5e4f3 Fix phpcs 2018-07-10 13:56:03 +02:00
Laurent Destailleur
a55abb4da7 Fix version 2018-07-10 13:54:20 +02:00
Laurent Destailleur
b6180fcb58 Fix fetch index in ecm when using multicompany 2018-07-10 12:00:09 +02:00
Laurent Destailleur
8e0a663b7c Code comment 2018-07-10 10:53:59 +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
19c652ce06
Merge pull request #9066 from hregis/8.0_product 
Fix: differentiate customer prices from supplier prices sharing with getEntity("productsupplierprice")
 2018-07-09 17:05:36 +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
e427496ddf FIX Injection 2018-07-09 14:13:01 +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
Alexandre SPANGARO
655d55eae6 Add customer accountancy code on deposit slips export 2018-07-07 02:46:56 +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
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
05ed721a8c Fix name of constant for module TICKET 2018-07-06 13:09:07 +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
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
Laurent Destailleur
38cd5180d9 FIX for migration from old versions 2018-07-03 20:11:59 +02:00
Laurent Destailleur
50df452b9e Fix status "Supplier" not always visible. 2018-07-03 17:37:23 +02:00
Laurent Destailleur
f93f5bd6e0 Fix travis 2018-07-03 13:49:41 +02:00
Laurent Destailleur
cfb41d4329 FIX: If module workflow disabled, we must disable autoclassification too 2018-07-03 11:43:50 +02:00
Laurent Destailleur
7ef6b16d31 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/install/step1.php
 2018-07-03 10:04:25 +02:00
Laurent Destailleur
0138b0e0b7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2018-07-03 10:01:30 +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
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
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
Regis Houssin
9709207a4f Fix: superadmin can show all users in master entity 2018-07-02 10:18:16 +02:00
Regis Houssin
df718cca5c Fix: better sql request with multicompany transverse mode 2018-07-02 10:09:56 +02:00
Regis Houssin
233ad2945c Fix: missing hook parameter 2018-07-01 20:03:08 +02:00
Regis Houssin
f13dd9c9bd Fix: missing hook parameter 2018-07-01 18:22:18 +02:00
Regis Houssin
8f124efc15 Fix: wrong mysql resource name 2018-07-01 17:48:01 +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
Regis Houssin
df55bee8ae Fix: missing "$disableremove" global 2018-07-01 15:33:10 +02:00
Laurent Destailleur
292d7967c3
Merge pull request #9021 from grandoc/8.0 
Fix : Notice: A non well formed numeric value encountered line 509
 2018-06-29 20:02:54 +02:00
Laurent Destailleur
9004a51880
Update conf.class.php 2018-06-29 20:02:40 +02:00
Laurent Destailleur
4ace9dd12d
Merge pull request #9015 from hregis/8.0_bug 
Fix: remove unused and blocking field
 2018-06-29 19:58:25 +02:00
Laurent Destailleur
a011140243
Merge pull request #9025 from atm-quentin/FIX_missing_type_element 
Fix missing type element
 2018-06-29 19:57:16 +02:00
Laurent Destailleur
2175a012e1 Fix lang 2018-06-29 18:23:59 +02:00
Regis Houssin
2d13b5b59d Fix: broken feature with edit in place 2018-06-29 15:57:34 +02:00
Laurent Destailleur
66f0ee9e18 Fix hack with hook to solve a problem to let a chance of external 
modules to be visible to android webview.
 2018-06-28 22:59:53 +02:00
Inovea Conseil
c4513a755d Fix extrafields resource 2018-06-28 16:39:37 +02:00
atm-quentin
9125586692 FIX need element type on select filter 2018-06-28 15:52:40 +02:00
Maxime Kohlhaas
5756955d55 Fix link to create event had no socid if from thirdparty card 2018-06-28 14:27:59 +02:00
Philippe GRAND
a4ccb47b78 Fix : Notice: A non well formed numeric value encountered line 509 2018-06-28 12:18:03 +02:00
Laurent Destailleur
055d818069 FIX dashboard with IE10 not supporting flex 2018-06-28 12:09:13 +02:00
Laurent Destailleur
6fc6a743c8 Fix template email message html/nohtml 2018-06-27 12:11:49 +02:00
Laurent Destailleur
9eaca045e4 Fix default message with online payment link must be hidden when no 
online payment mode exists.
 2018-06-27 11:34:40 +02:00
Regis Houssin
775e11ce33 Fix: wrong table name 2018-06-27 09:33:09 +02:00
Laurent Destailleur
ac758e02a9 Fix error message with old usage of childtables 2018-06-27 01:32:54 +02:00
Laurent Destailleur
ff6ffa4738 Fix data in tooltip 2018-06-27 00:38:42 +02:00
Laurent Destailleur
8147152ec8 Fix look and feel v8 2018-06-26 11:25:28 +02:00
Laurent Destailleur
969b272576 Rename menu entries and report title for better understanding 2018-06-26 11:18:31 +02:00
Laurent Destailleur
cbe682582e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-26 01:25:24 +02:00
Laurent Destailleur
5c93fa1bfb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/journals_list.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/fr_FR/other.lang
 2018-06-26 01:25:03 +02:00
Laurent Destailleur
9f77ea0ece Code comment 2018-06-25 17:05:15 +02:00
Laurent Destailleur
36402c22ee FIX SQL Injections reported by mu shcor (ADLab of Venustech) 2018-06-25 14:06:09 +02:00
Laurent Destailleur
16ea078615
Merge pull request #9010 from grandoc/new_branch_24_06_2018 
update and clean code
 2018-06-25 12:28:00 +02:00
Laurent Destailleur
97976fbb43 Fix type of parameter must be string 2018-06-25 09:19:45 +02:00
Regis Houssin
a6729b0bd1 Fix: change field name and remove obsolete data 2018-06-25 09:10:24 +02:00
Philippe GRAND
1bb91c7860 update and clean code 2018-06-24 16:20:27 +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
25b1d063ae Fix length of hidden password 2018-06-24 11:45:10 +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
Laurent Destailleur
5829014218
Merge branch 'develop' into NEW_advance_targer_filter_everywhere 2018-06-24 10:24:26 +02:00
Laurent Destailleur
3fa5649040 Fix bad test (dev journal visible when dev option on) 2018-06-23 15:22:39 +02:00
Laurent Destailleur
00165871bd CSS 2018-06-23 15:10:44 +02:00
Laurent Destailleur
6dba88ab6e Several fixes in look and feel 2018-06-23 14:23:07 +02:00
Laurent Destailleur
06342ff80c FIX contextpage on contact list 2018-06-23 12:06:17 +02:00
Laurent Destailleur
4dcc74d08f Fix the "back to list" link also restore the contextpage 2018-06-23 11:55:04 +02:00
Laurent Destailleur
f2ac5dab4a Fix contextpage of some menu entries 2018-06-23 10:28:06 +02:00
Laurent Destailleur
7daee6dc6b A lot of fix of css and look and feel v8 2018-06-23 00:07:56 +02:00
Laurent Destailleur
533c19cc2c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/core/lib/functions.lib.php
 2018-06-22 15:29:26 +02:00
Laurent Destailleur
1cef4c1563
Merge pull request #8995 from ATM-Marc/FIX_develop_PR8841 
FIX PR #8841
 2018-06-22 15:10:33 +02:00
atm-quentin
d53aa71673 NEW advance target filtering can be used everywhere with tpl and fk_element 2018-06-22 10:54:00 +02:00
Laurent Destailleur
88d3bf0148 FIX creation of tasks must hide closed project 2018-06-21 18:47:02 +02:00
Laurent Destailleur
a3b9d4f01b Fix tooltip on subsidiary list 2018-06-20 22:02:36 +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