lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
78,312 Commits 43 Branches 150 Tags 886 MiB
d811de4da2
Commit Graph

1361 Commits

Author SHA1 Message Date
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
cbdc669ba9
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-29 18:45:36 +02:00
Laurent Destailleur
7bf48b8d77 Fix date_start and date_end not saved on supplier invoice 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2018-08-29 17:26:41 +02:00
Laurent Destailleur
98356c6ed0 Fix date_start and date_end not saved on supplier invoice 2018-08-29 17:03:18 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing 
Trimtrailing
 2018-08-28 02:30:02 +02:00
Philippe GRAND
215677c972 Standardize and update code 2018-08-23 18:17:09 +02:00
Philippe Grand
e09f7bedd0
Update commonobject.class.php 2018-08-23 09:57:19 +02:00
Philippe GRAND
504b0e3d16 Update and standardize code 2018-08-22 18:34:50 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-21 14:03:02 +02:00
Frédéric FRANCE
39462742e2
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-16 08:17:55 +02:00
Laurent Destailleur
b515511ad6
Merge branch 'develop' into FunctionDeclaration 2018-08-16 00:52:55 +02:00
Laurent Destailleur
5c712a6cd3
Merge branch 'develop' into trimtrailing 2018-08-16 00:47:09 +02:00
Frédéric FRANCE
7bb781eea8
function declaration 2018-08-15 14:28:34 +02:00
Frédéric FRANCE
5146ab9177
trim 2018-08-14 15:34:44 +02:00
Frédéric FRANCE
a0a6afc224
return comment 2018-08-14 12:23:10 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +02:00
Laurent Destailleur
9fc5d39d07 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:22 +02:00
Laurent Destailleur
2f559a7edb
Merge pull request #9199 from atm-quentin/FIX_hook_update_price 
NEW Add hook changeRoundingMode in update_price
 2018-08-12 18:17:52 +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
John BOTELLA
d6d8f98f38 add retained warranty cond field and add forms 2018-08-10 15:06:00 +02:00
Laurent Destailleur
61d7629ab1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
 2018-08-08 17:44:22 +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
ATM-Nicolas
5b15e688af FIX : PHP warning, undefined index notnull 2018-08-07 09:38:18 +02:00
atm-quentin
6662bf05ba FIX hook on update price AND fix id on line 2018-08-03 11:47:43 +02:00
Laurent Destailleur
508133b336 Clean code 2018-07-17 13:04:54 +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
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
df55bee8ae Fix: missing "$disableremove" global 2018-07-01 15:33:10 +02:00
Laurent Destailleur
ee2d543781
Merge pull request #8837 from delcroip/patch-modulebuilder-supportsellist 
NEW support selllist in the  module builder
 2018-06-30 15:33:17 +02:00
Laurent Destailleur
ac758e02a9 Fix error message with old usage of childtables 2018-06-27 01:32:54 +02:00
Laurent Destailleur
668608db5e Fix error message with old usage of childtables 2018-06-26 18:26:44 +02:00
Laurent Destailleur
00165871bd CSS 2018-06-23 15:10:44 +02:00
Laurent Destailleur
4b84b7ccf2
Merge pull request #8926 from fappels/develop_fix_setvaluefrom 
FIX commonobject setValueFrom trigger
 2018-06-13 20:50:26 +02:00
Laurent Destailleur
50aa674ebc Fix support of 'help' field property. Fix bad td closing. 2018-06-13 13:36:40 +02:00
fappels
a9f60bcdac fix travis 2018-06-06 22:04:12 +02:00
fappels
81ef355b65 Fix trigger on setValueFrom 
Load updated values into object for trigger.
 2018-06-06 17:10:46 +02:00
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00
Laurent Destailleur
b094ae953e Better log 2018-06-01 17:20:49 +02:00
Laurent Destailleur
7eea70ebc8 FIX #8858 #8860 Backport better compatibility fix 2018-05-29 10:13:34 +02:00
Frédéric FRANCE
e2a557aadd
limit length of lines to 500 chars 2018-05-27 15:04:12 +02:00
patrick Delcroix
ef37fccef4 Merge origin/patch-modulebuilder-supportsellist into patch-modulebuilder-supportsellist 2018-05-26 23:43:17 +02:00
patrick Delcroix
adda3144bc Fix Show double(x,y) fields 2018-05-26 23:39:36 +02:00
Laurent Destailleur
bcbe28d802 Code comment 2018-05-25 12:48:33 +02:00
Laurent Destailleur
f3713844ee
Update commonobject.class.php 2018-05-25 12:38:01 +02:00
Laurent Destailleur
770e97431b
Update commonobject.class.php 2018-05-25 12:36:38 +02:00
Laurent Destailleur
86b1904a41
Update commonobject.class.php 2018-05-25 12:33:30 +02:00
Laurent Destailleur
520ce99e56
Merge pull request #8828 from bgenere/develop 
FIX : showOptionals function is now consistent with template Extrafield_view.tpl.php
 2018-05-25 11:17:45 +02:00
Laurent Destailleur
a3bea8d298
Update commonobject.class.php 2018-05-25 11:17:01 +02:00
Laurent Destailleur
fbcaf8872b
Merge pull request #8808 from atm-john/Add_table_thead_and_tbody 
Add table thead and tbody for object lines
 2018-05-25 10:42:26 +02:00
delcroix Patrick
3158fdc551
Update commonobject.class.php 2018-05-24 21:20:34 +02:00
delcroix Patrick
c85d216f8e
Merge branch 'develop' into patch-modulebuilder-supportsellist 2018-05-22 22:24:20 +02:00
patrick Delcroix
29d26b6e89 New: support sellist in modulebuilder 2018-05-22 22:16:25 +02:00
patrick Delcroix
2ccaf1ad95 New: support sellist in modulebuilder 2018-05-22 22:00:20 +02:00
Laurent Destailleur
1b20ec05d1 Save translation 2018-05-21 19:37:47 +02:00
Laurent Destailleur
c141c3ecfd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-21 19:35:26 +02:00
Laurent Destailleur
05c2f206ff Fix missing lang 2018-05-21 19:35:12 +02:00
bgenere
227539d647 FIX : showOptionals function is now consistent with template 
Extrafield_view.tpl.php for date and datetime fields

The jdate function is not called when not needed.
 2018-05-21 16:55:35 +02:00
John
8710cf570d Add table thead and tbody for object lines 2018-05-17 16:52:16 +02:00
John
b01893d536 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation_pull 2018-05-16 15:29:57 +02:00
TuxGasy
12440e6a7e Do not display multicurrency cols if currency of object is same as main currency 2018-05-02 11:30:35 +02:00
Laurent Destailleur
2fc2c44de4 Fix phpcs 2018-04-29 20:18:50 +02:00
Laurent Destailleur
0cdfd6800a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-29 20:11:47 +02:00
Regis Houssin
2906358383 Fix: use "socpeople" instead "societe" 2018-04-27 10:42:10 +02:00
Laurent Destailleur
659fd46b76
Merge pull request #8653 from ATM-Marc/NEW_commonObject_array 
NEW: work on CommonObject 'array' field typeNew common object array
 2018-04-27 09:39:26 +02:00
Laurent Destailleur
9d070cac87 NEW Can add product in supplier order/invoice even w/o predefined price 
Add option SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY,
SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY and
SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY to restore restricted old
behaviour.
 2018-04-24 12:57:31 +02:00
florian HENRY
67329b8805 fix commonobject double style 2018-04-24 12:33:07 +02:00
Laurent Destailleur
fb8ad77378 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2018-04-23 23:09:53 +02:00
Laurent Destailleur
0a5e606937 FIX extrafields price and double were lost during a failed post. 2018-04-23 22:53:57 +02:00
Laurent Destailleur
e9a2894727 Fix PSR2 2018-04-22 20:59:29 +02:00
Laurent Destailleur
cca4b1cbf5 NEW Optimize load of hooks classes (save 1-5Kb of memory) 2018-04-21 11:24:45 +02:00
Marc de Lima Lucio
39e890e2d7 FIX: handle non-js users 2018-04-20 16:43:27 +02:00
Marc de Lima Lucio
2bf66780cb FIX: travis + code readability 2018-04-20 16:38:52 +02:00
Marc de Lima Lucio
41a0727481 NEW: work on CommonObject 'array' field type 2018-04-20 16:38:52 +02:00
Laurent Destailleur
d0efc41983 New support of option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD 2018-04-20 14:50:11 +02:00
Laurent Destailleur
bbd1257222 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-20 01:50:08 +02:00
Laurent Destailleur
e621daa61d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-20 01:47:54 +02:00
Laurent Destailleur
54154343b2
Merge pull request #8643 from ATM-Marc/FIX_7.0_commonobject_default 
FIX: CommonObject: don't require 'notnull' field if 'default' set
 2018-04-20 01:28:00 +02:00
Marc de Lima Lucio
893ce55852 FIX: commonobject: don't require notnull field if default set 2018-04-19 10:29:48 +02:00
Marc de Lima Lucio
e88830820a FIX: dont print empty date in CommonObject::showOutputField 2018-04-18 11:13:18 +02:00
Regis Houssin
ff76e60c49 Fix: some bugs and warnings 2018-04-18 10:13:20 +02:00
Laurent Destailleur
2135365e0a Bug new extrafields architecture 2018-04-17 14:44:55 +02:00
Laurent Destailleur
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Philippe GRAND
0a6bcb2a39 fix typo and translation 2018-04-15 07:37:23 +02:00
Philippe GRAND
7943a19402 fix typo 2018-04-15 07:07:04 +02:00
Laurent Destailleur
9f5eed0c9a Code comment 2018-04-13 14:12:31 +02:00
Laurent Destailleur
fbae4429b7 Clean code for better extrafields management 2018-04-13 12:52:23 +02:00
Laurent Destailleur
78fcbe9633 FIX the extrafields separator was not translated 2018-04-13 10:48:29 +02:00
Laurent Destailleur
3cecfd02c7 NEW Mutualize code for action="update_extras" 
NEW Can use setValueFrom without user modification field
FIX Exclude separators from mandatory extrafields test
More code to use the new framework array for extrafields
Can use text condition in extrafield visibility
 2018-04-12 23:16:23 +02:00
Laurent Destailleur
ea2fd67e0d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/langs/de_DE/admin.lang
 2018-04-12 13:31:14 +02:00
Laurent Destailleur
ca6b7205ef
Update commonobject.class.php 2018-04-11 16:27:56 +02:00
Laurent Destailleur
273eadab43
Merge pull request #8547 from ATM-Marc/NEW_linked_objects_orderby 
NEW: can specify SQL 'ORDER BY' clause in fetchObjectLinked (issue #7830)
 2018-04-11 13:18:10 +02:00
Laurent Destailleur
f181719769 Can fetch a companypaymentmode of a thirdparty 2018-04-10 18:11:08 +02:00
ATM-Nicolas
47d5b1f6fd FIX : update wrong datetime extrafield 2018-04-10 16:39:28 +02:00
Marc de Lima Lucio
7aa4d16eef NEW: can specify SQL 'ORDER BY' clause in fetchObjectLinked 2018-04-10 16:23:56 +02:00
Laurent Destailleur
0bf4381226 NEW The field "visible" on extrafield can accept expression as condition 2018-04-10 15:39:11 +02:00
Laurent Destailleur
24f4d5040a Move isInEEC from common to thirdparty class. 2018-04-09 14:25:02 +02:00
John
63180f45a8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation 2018-04-09 09:17:26 +02:00
Laurent Destailleur
2d547abaa9
Merge pull request #8498 from atm-john/New_import_lines_from_linked_element 
New import lines from linked element
 2018-04-05 18:26:47 +02:00
Laurent Destailleur
eeb2d5a4da Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/cron/list.php
 2018-04-05 13:24:36 +02:00
Regis Houssin
5914bfdf18 Fix: more complete 2018-04-05 13:00:55 +02:00
Regis Houssin
156d26ddb9 Fix: backward compatibility 2018-04-05 13:00:50 +02:00
John
ce24ca08ee move list of situation table and fix credit note display 2018-04-04 12:33:48 +02:00
John
b7681e7249 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation 2018-04-03 14:12:49 +02:00
John
d689e88b92 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element 2018-04-03 11:38:12 +02:00
florian HENRY
cc7deb0add Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0 2018-03-29 09:36:05 +02:00
florian HENRY
78812ef826 better error management 2018-03-29 09:35:47 +02:00
Laurent Destailleur
1c86eb1c44 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/localtax/index.php
	htdocs/compta/tva/quarter_report.php
	htdocs/core/lib/tax.lib.php
 2018-03-29 03:08:01 +02:00
Laurent Destailleur
125085acee Fix name of method to avoid ci errors 2018-03-29 03:01:05 +02:00
florian HENRY
af7c1d8da1 fix error log 2018-03-27 18:39:18 +02:00
Laurent Destailleur
852191010a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-03-25 15:29:11 +02:00
fappels
caa43ae2f6 Make helper methods available for derived classes. 
Use-case: a module build with modulebuilder can make it's own fetch
method using the helper methods.
 2018-03-23 17:35:46 +01:00
John
88fab15c60 Change situation display 2018-03-23 17:12:09 +01:00
Laurent Destailleur
171ad5dce2 Enhance code for template invoices 2018-03-22 21:42:19 +01:00
Laurent Destailleur
700c69e127 NEW Can set position of images in module tickets 
Mutualize code of method show_photo
 2018-03-22 11:46:35 +01:00
Laurent Destailleur
d7ad899839 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/conf.class.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/holiday/list.php
 2018-03-20 14:52:27 +01:00
Laurent Destailleur
8cf2d4eb45 Fix filter on holiday statut 
Fix tr/td balance for extrafields on lines
 2018-03-20 10:10:21 +01:00
Laurent Destailleur
f8ca4b1b5c NEW Add option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD 2018-03-19 11:34:48 +01:00
Laurent Destailleur
3f7cd8b1bd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-14 13:56:41 +01:00
Laurent Destailleur
5c2a005e75 Work on generic customer payment modes 2018-03-14 13:56:21 +01:00
Laurent Destailleur
cc9a6ee6e0
Merge pull request #7428 from ruistrecht-alt/NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 
NEW Show region in company info & Global option to show state code MAIN_SHOW_STATE_CODE
 2018-03-14 10:49:54 +01:00
Laurent Destailleur
da617f7d32 Can work both with remote and local payment modes 2018-03-13 22:43:50 +01:00
Alexis Algoud
74dc815bfa fix commonobject isInt for module builder capabilities 2018-03-10 19:02:06 +01:00
Alexis Algoud
b370a3096c fix commonobject isInt for module builder capabilities 2018-03-10 14:14:31 +01:00
Laurent Destailleur
cc7ac2a0da
Merge pull request #8313 from atm-florian/7.0_fix8241 
7.0 fix8241
 2018-03-09 22:47:43 +01:00
florian HENRY
42fed5981d bettre syntax 2018-03-09 19:16:06 +01:00
florian HENRY
02beed265e better space 2018-03-09 19:14:43 +01:00
florian HENRY
5a56e802d9 FIX #8232 2018-03-09 19:10:52 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm 
NEW: supplier credit notes & discounts (absolute and relative)
 2018-03-08 20:06:37 +01:00
Laurent Destailleur
7e6ba51780 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/tasks/comment.php
 2018-03-07 13:06:29 +01:00
florian HENRY
03873038d5 fix comment task 2018-03-07 08:47:34 +01:00
Marc de Lima Lucio
1765b09fda Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-03-05 11:05:38 +01:00
Laurent Destailleur
9355c5a8d7 Fix scrutinizer 2018-03-04 11:31:57 +01:00
Laurent Destailleur
e574ec4bf1 Fix backward compatibility 2018-03-04 11:28:01 +01:00
Laurent Destailleur
82fd84fb48 Fix scrutinizer errors 2018-03-04 11:22:43 +01:00
Laurent Destailleur
6338328c90 Fix scrutinizer errors 2018-03-04 11:09:53 +01:00
Laurent Destailleur
7584fe62e3
Merge pull request #8244 from hregis/develop_bug 
Fix: avoid warning during "upgrade2" process
 2018-03-02 17:51:47 +01:00
Laurent Destailleur
48b578b9f2
Update commonobject.class.php 2018-03-02 17:51:21 +01:00
Laurent Destailleur
0f237e4d5c NEW Add mass action enable/disable on cron job list 2018-03-01 15:24:50 +01:00
Marc de Lima Lucio
7cd1b2caa9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-02-27 16:45:01 +01:00
Laurent Destailleur
8ac4cb9c43 Add fetch_product 2018-02-27 16:33:50 +01:00
Regis Houssin
1aa1b0a3ea Fix: avoid warning during "upgrade2" process 2018-02-26 12:15:30 +01:00
Laurent Destailleur
c8078b54b5 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
 2018-02-24 12:52:57 +01:00
Laurent Destailleur
435e4823a5 Fix some warning during install 2018-02-24 11:58:09 +01:00
Laurent Destailleur
d8bf553ea9 Add option THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD for logo indexing 2018-02-23 19:55:15 +01:00
Laurent Destailleur
7cf7bf6e45 Code comment 2018-02-23 16:26:23 +01:00
Laurent Destailleur
f3e1e81219 Fix update of extrafield password that are crypted 2018-02-23 16:11:25 +01:00
Laurent Destailleur
93a8176813 Fix do not encrypt if empty 2018-02-23 15:28:24 +01:00
Laurent Destailleur
863cab362f NEW Cat set the encryption algorithm for extrafields of type password 2018-02-23 14:38:41 +01:00
John
f313fb925b Add new checkbox for lines 2018-02-21 17:06:40 +01:00
Laurent Destailleur
b4446764f8 Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
John
bd0e8506f5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element 2018-02-21 11:53:16 +01:00
Laurent Destailleur
34135e0a13 Fix extrafield date or datetime with bad timezone 2018-02-20 19:20:47 +01:00
Laurent Destailleur
e465b0c40e Fix extrafield date or datetime with bad timezone 2018-02-20 19:19:27 +01:00
John
09c5dc506a Add html dom element and fix class 2018-02-20 17:46:32 +01:00
Marc de Lima Lucio
f5ad93b272 NEW: supplier credit notes: handle Excess Paid + translation 2018-02-19 15:52:07 +01:00
Marc de Lima Lucio
e2b65b3755 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note 2018-02-16 09:14:53 +01:00
Laurent Destailleur
362aec3e4b NEW Add param $dolibarr_main_restrict_ip in config file to limit ips 2018-02-15 19:49:50 +01:00
Laurent Destailleur
6b74c79798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-02-15 15:34:17 +01:00
Laurent Destailleur
b515448bbd Fix delete when no extrafields used 2018-02-15 00:01:25 +01:00
Laurent Destailleur
5f0f9ff326 Fix delete page 2018-02-14 23:57:57 +01:00
Marc de Lima Lucio
4f9bb33600 NEW: supplier credit notes: convert to usable absolute discount + link/unlink to supplier invoice + create supplier credit note from excess paid 2018-02-14 10:47:10 +01:00
Laurent Destailleur
36ac380cac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 22:26:48 +01:00
Laurent Destailleur
b2835fc803 Fix check of vat only for european countries 2018-02-12 15:54:24 +01:00
Laurent Destailleur
eccdc9a075 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/langs/pt_PT/companies.lang
 2018-02-08 15:20:24 +01:00
Laurent Destailleur
ab21769aa2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/card.php
 2018-02-08 12:58:47 +01:00
Rui Strecht
8c732a1443 Trying to not include sql request into method setMysoc 2018-02-06 12:01:54 +00:00
Rui Strecht
31372f8948 Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 
# Conflicts:
#	htdocs/core/class/commonobject.class.php
 2018-02-06 10:26:38 +00:00
Laurent Destailleur
eedbcbdc40
Merge branch 'develop' into patch-2 2018-02-05 15:43:18 +01:00
Laurent Destailleur
6291cb4cbe
Update commonobject.class.php 2018-02-05 15:41:34 +01:00
Laurent Destailleur
9a0dca57af
Update commonobject.class.php 2018-02-05 15:40:18 +01:00
Laurent Destailleur
9731a7fedc Code for update more similar than insert 2018-02-05 15:31:40 +01:00
Regis Houssin
839de65012 Fix: avoid error -1 2018-02-05 11:30:31 +01:00
Laurent Destailleur
f57ea2682a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/notify.class.php
	htdocs/societe/class/societe.class.php
 2018-02-03 19:33:24 +01:00
Regis Houssin
13106d34a6 Fix: compatibility with multicompany sharing 2018-02-02 12:36:47 +01:00
Laurent Destailleur
0412d3d11d Fix extrafield mandatory check.Fix empty extrafields with type link. 2018-02-01 19:05:24 +01:00
Laurent Destailleur
ed3bcf59b6 Try doc hint array of array of int with @var int[][] 2018-02-01 10:50:50 +01:00
Laurent Destailleur
14ecdce650 Fix merge of thirdparties (pb when merging codes and error management) 2018-01-31 18:01:56 +01:00
Rui Strecht
b387c3fdf8 Forgot to update other files to same PR changes 2018-01-31 11:45:30 +00:00
Rui Strecht
75b9caf744
Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 2018-01-31 11:19:39 +00:00
Frédéric FRANCE
336c44dc88
trigger on shipping method update 2018-01-26 08:33:35 +01:00
Frédéric FRANCE
d0e83b7902
trigger on bank account update 2018-01-26 08:14:39 +01:00
Frédéric FRANCE
ec38b8a5a2
Update interface_99_modMyModule_MyModuleTriggers.class.php 2018-01-25 22:07:10 +01:00
Frédéric FRANCE
9e0a548eff
Update commonobject.class.php 2018-01-25 17:42:25 +01:00
fappels
00185bd9d4 Fix fetchCommon should return 0 iso error if not found 2018-01-15 11:21:24 +01:00
fappels
25b455272a Fix 0 is a valif value for a NOT NULL field 2018-01-14 15:31:31 +01:00
Laurent Destailleur
50596a5214 Fix trans key 2018-01-12 14:06:48 +01:00
Laurent Destailleur
e6c7f9e69b Debug module inventory 2017-12-22 21:29:09 +01:00
Laurent Destailleur
f504716501 Fix sync contact - external user 2017-12-19 16:16:31 +01:00
Laurent Destailleur
1351a43a30 FIX Maxi debug of permission for users external or restricted to sales 
representatives
 2017-12-18 16:13:05 +01:00
Laurent Destailleur
247c380d18 Several fixes 2017-12-12 16:11:40 +01:00
Laurent Destailleur
cc813df2a5 Fix modulebuilder 2017-12-09 20:17:47 +01:00
Laurent Destailleur
f22e7ee24a Fixes 2017-12-09 17:29:19 +01:00
Laurent Destailleur
ce32da6217 Fix debugs APIs 2017-12-01 15:39:18 +01:00
Laurent Destailleur
0b9a3087ea Fix bug reported by scrutinizer 2017-11-25 12:11:02 +01:00
Laurent Destailleur
c16a150a70 NEW Remove background on agenda view when event is a not busy event. 2017-11-24 20:02:46 +01:00
Laurent Destailleur
831099fef8 Debug modulebuilder 2017-11-24 16:24:42 +01:00
Laurent Destailleur
b93e35cdd2 Fix a lot of request to use the IN getentity instead of = 
Fix a lot of request to use left join on type of payment table
 2017-11-23 15:06:16 +01:00
Laurent Destailleur
aa91b9075a Fix cancel button 2017-11-22 11:54:02 +01:00
Laurent Destailleur
5849efd9fc Work on public sharing files 2017-11-19 20:44:57 +01:00
Laurent Destailleur
c85acbfc11 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/install/repair.php
 2017-11-14 19:47:33 +01:00
Laurent Destailleur
b5196b7164 FIX A lot of several fix on local taxes and NPR tax 2017-11-13 14:24:40 +01:00
Laurent Destailleur
53a523ba9d Module builder 2017-11-12 20:45:06 +01:00
Laurent Destailleur
955ed7dbbf NEW Show the supplier ref into supplier cards 2017-11-12 15:30:21 +01:00
Regis Houssin
3ffe1b6725 Fix: missing status 3 (only on form) 2017-11-10 16:51:37 +01:00
Laurent Destailleur
c78c06776b Fix bug reported by scrutinizer 2017-11-05 03:39:27 +01:00
Laurent Destailleur
cd70e1506b Work on common core code 2017-11-03 17:20:08 +01:00
Laurent Destailleur
a346a1a5e9 Work on website module 2017-11-03 15:56:16 +01:00
Laurent Destailleur
f26d970d58 Remove option MAIN_HTML5_PLACEHOLDER (on by default now) 2017-11-01 10:17:24 +01:00
Laurent Destailleur
9458c80c48 Work on reminders 2017-10-31 23:10:29 +01:00
Laurent Destailleur
bbe1c9c494 NEW Can download PDF document from the payment page 2017-10-30 00:45:47 +01:00
Laurent Destailleur
76b0e7ee5a NEW Add option PROPOSAL/ORDER/INVOICE_ALLOW_EXTERNAL_DOWNLOAD 2017-10-29 21:24:54 +01:00
Laurent Destailleur
00db7e16ec Clean code 2017-10-28 16:00:07 +02:00
Laurent Destailleur
9283aaf6aa Fix scrutinizer 2017-10-27 00:07:58 +02:00
Laurent Destailleur
89baa0b307 Work on website 2017-10-26 14:49:30 +02:00
Laurent Destailleur
e865f41b86 NEW Extrafields "link to object" now use a combo selection and getNomUrl 2017-10-26 02:55:43 +02:00
Laurent Destailleur
66d2c29fe1 Work on modulebuilder and website module 2017-10-26 01:02:13 +02:00
Laurent Destailleur
202712be94 Work on module builder 2017-10-25 22:02:07 +02:00
Laurent Destailleur
bb996019c2 NEW Support visibility on extrafields 2017-10-25 11:42:14 +02:00
Laurent Destailleur
0b120dd1a9 Prepare code to remove hooks on extrafield update 2017-10-24 18:45:34 +02:00
Laurent Destailleur
5984222794 FIX #7679 2017-10-22 03:47:36 +02:00
Laurent Destailleur
19a5780f7f Clean code 2017-10-20 23:49:20 +02:00
Laurent Destailleur
9c45e86a1c Introduce main_doc into table of objects to know what is main doc. 
Work on option PROPOSAL_USE_ONLINE_SIGN
 2017-10-19 11:40:40 +02:00
Laurent Destailleur
8b140ab069 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-17 10:44:29 +02:00
Laurent Destailleur
eb1fdca157 NEW Can create intervention from a proposal 2017-10-17 10:44:18 +02:00
florian HENRY
51ce8bf2a5 js 2017-10-16 21:08:09 +02:00
florian HENRY
17db813a4e Logical variable name suffix/prefix 2017-10-16 21:05:12 +02:00
florian HENRY
695740142a FIX : Extrafield default value admin/defaultvalues.php enabled 2017-10-16 20:54:53 +02:00
Rui Strecht
6c0cb31c08 Fixed issue with merge error 2017-10-09 11:44:10 +01:00
Rui Strecht
1a5cdf2406 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 
# Conflicts:
#	htdocs/admin/company.php
#	htdocs/core/class/commonobject.class.php
 2017-10-09 11:36:38 +01:00
Laurent Destailleur
3e0ccd6312 FIX #7585 2017-10-09 10:43:19 +02:00
Scrutinizer Auto-Fixer
328d39bc71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-07 11:09:31 +00:00
Laurent Destailleur
2148622d40 Clean code 2017-10-06 12:55:48 +02:00
Inovea Conseil
2f3f04c2b1 Add constant to manage update_price function 
Some external module want no update price after a trigger because they have a other method to calculate the total (ex: with a extrafield).
 2017-10-06 10:42:25 +02:00
Laurent Destailleur
ded55f41fb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2017-10-04 16:08:22 +02:00
Laurent Destailleur
13cb806436 FIX #7531 #7537 2017-10-04 15:18:15 +02:00
Laurent Destailleur
75a7e086b3 Merge pull request #7427 from atm-arnaud/NEW_comment_generic_element 
New comment generic element
 2017-10-04 11:13:39 +02:00
Laurent Destailleur
e23a88732e Fix default value on extrafields 2017-09-30 20:05:34 +02:00
arnaud
f29ea35dc8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element 2017-09-27 14:56:52 +02:00
Rui Strecht
3ebb18ab16 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 2017-09-26 16:34:59 +01:00
Laurent Destailleur
c9e9f60f8f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-09-25 19:55:52 +02:00
Laurent Destailleur
fe55feb82f FIX #7461 2017-09-25 19:45:01 +02:00
Rui Strecht
395100ca70 Added missing comments for new function parameters, removed unused parameter $searchlabel 2017-09-20 12:45:18 +01:00
Rui Strecht
24f8ea003a Added self to contributors list 2017-09-20 12:30:59 +01:00
Rui Strecht
f1126b65bf Updated method to fetch state name, code and id to match method used with country 
Reverted some previous changes to allow backwards compatibility
Extended MAIN_SHOW_REGION_IN_STATE to include showing region in thirdparty card
 2017-09-20 12:06:35 +01:00