Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-13 21:11:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,347 Commits 36 Branches 190 Tags
b8c88a214449d5129fd4c479249cfa7c2373d10d
Commit Graph

14407 Commits

Author SHA1 Message Date
Laurent Destailleur
c25e21de4b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-13 23:19:22 +02:00
Laurent Destailleur
ecfabc6633 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-04-13 23:18:39 +02:00
Laurent Destailleur
a0e243a29b Clean code 2018-04-13 23:11:19 +02:00
Laurent Destailleur
93ea46c58c Merge branch 'develop' into develop-ecmfiles 2018-04-13 23:08:26 +02:00
Laurent Destailleur
3b202b2255 Merge branch 'develop' into develop_bug5 2018-04-13 22:23:14 +02:00
Laurent Destailleur
374a0723bf Fix VAT report by rate 2018-04-13 22:20:14 +02:00
Regis Houssin
556a418132 Fix: best method 2018-04-13 19:30:11 +02:00
Laurent Destailleur
6f91b8019f Remove warnings 2018-04-13 17:54:27 +02:00
Regis Houssin
199bf4c044 Fix: avoid focus problem when select2 is in a modal dialog window 2018-04-13 17:10:07 +02:00
fappels
e054d1ae8d Try to fix travis 2018-04-13 16:49:03 +02:00
Laurent Destailleur
4251748aca Clean code 2018-04-13 16:18:33 +02:00
Laurent Destailleur
77a853e49d Fix remove warning 2018-04-13 14:53:40 +02:00
Laurent Destailleur
9f5eed0c9a Code comment 2018-04-13 14:12:31 +02:00
Laurent Destailleur
be965bdbab Clean code 2018-04-13 13:28:48 +02:00
Laurent Destailleur
b68cded9c4 Clean code 2018-04-13 13:11:07 +02:00
Laurent Destailleur
fbae4429b7 Clean code for better extrafields management 2018-04-13 12:52:23 +02:00
Regis Houssin
e6ff852226 Fix: avoid Warning: Creating default object from empty value 2018-04-13 11:20:21 +02:00
Laurent Destailleur
78fcbe9633 FIX the extrafields separator was not translated 2018-04-13 10:48:29 +02:00
Laurent Destailleur
768b9d3d1e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-13 10:01:45 +02:00
Laurent Destailleur
6e288fca75 Merge pull request #8575 from all3kcis/develop-patch-16 
NEW Add files management on products lot
 2018-04-13 00:57:13 +02:00
Laurent Destailleur
891925874f FIX #8574 2018-04-13 00:54:08 +02:00
Laurent Destailleur
ace55ba569 Debug usage of extrafields for ticket module 2018-04-12 23:17:46 +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
All-3kcis
21df700325 Add option to save file with product batch ref 
+ use batch number like ref instead of id
+ debug access to shared link
 2018-04-12 15:55:08 +02:00
All-3kcis
a8fbf4a370 Add option to save file with product ref 2018-04-12 15:40:09 +02:00
All-3kcis
f7e58f3c73 Add files management on products lot 2018-04-12 15:10:37 +02:00
Laurent Destailleur
dd022ee423 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-12 13:31:38 +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
e437989853 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-12 13:25:27 +02:00
Laurent Destailleur
eec99b436e Merge pull request #8565 from atm-greg/Add_supplierContactName_on_documents 
Add supplier contact name on supplier documents
 2018-04-11 19:25:01 +02:00
Laurent Destailleur
6cb0793d14 Merge pull request #7969 from marcosgdf/bug-4875 
FIX #4875 Remove external module code from Dolibarr core code - Introduce hook initSendToSocid instead
 2018-04-11 18:33:10 +02:00
Laurent Destailleur
e468584783 Update actions_sendmails.inc.php 2018-04-11 18:31:46 +02:00
Laurent Destailleur
3df873ee06 Merge pull request #8562 from ATM-Marc/FIX_modulebuilder 
FIX: various modulebuilder-related issues
 2018-04-11 18:01:04 +02:00
Laurent Destailleur
9ccba03a17 Update html.form.class.php 2018-04-11 18:00:34 +02:00
Laurent Destailleur
afdd504e16 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/accountancy/journal/sellsjournal.php
 2018-04-11 17:58:21 +02:00
Laurent Destailleur
698f5c165a Merge pull request #8430 from atm-florian/dev_mailtouser 
NEW : Can select from the user list into send form email (For field to and CC)
 2018-04-11 17:55:40 +02:00
atm-greg
ae34fa6fbd add supplier contact name on supplier documents 2018-04-11 17:42:26 +02:00
Laurent Destailleur
ac8520c114 Merge pull request #8557 from Gecka-Apps/7.0-substitution 
Passes the list of third parties and the list of objects ref to the complete_substitutions_array function as parameters.
 2018-04-11 17:40:38 +02:00
Laurent Destailleur
e543a6bf85 Merge pull request #8549 from atm-greg/fix_multiselect_filter 
FIX #8480
 2018-04-11 17:38:30 +02:00
Laurent Destailleur
1aace69b1a Update functions.lib.php 2018-04-11 17:37:00 +02:00
Laurent Destailleur
d7da83ebc5 Merge pull request #8560 from atm-john/Fix_extrafield_list_from_table_entity 
Fix extrafield entity query filter
 2018-04-11 17:31:36 +02:00
Laurent Destailleur
e4f2e0ecbd Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-11 17:21:14 +02:00
Laurent Destailleur
590bc2948a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
 2018-04-11 17:20:49 +02:00
Laurent Destailleur
0518218aed Fix regression 2018-04-11 17:17:03 +02:00
Laurent Destailleur
c70e0c1cda FIX #8475 #8540 2018-04-11 17:14:34 +02:00
Laurent Destailleur
23dba46c8c Merge pull request #8551 from ATM-Nicolas/fix_datetime_extrafields 
FIX : update wrong datetime extrafield
 2018-04-11 16:28:04 +02:00
Laurent Destailleur
ca6b7205ef Update commonobject.class.php 2018-04-11 16:27:56 +02:00
Laurent Destailleur
c392b9b8ef Merge pull request #8541 from atm-gauthier/FIX_count_6.0 
FIX #8478 !empty instead of count to avoid warning
 2018-04-11 14:55:41 +02:00
Laurent Destailleur
75bc3d17e6 Update admin_extrafields_view.tpl.php 2018-04-11 14:55:29 +02:00
Laurent Destailleur
bc1515cb56 Merge pull request #8535 from atm-greg/Fix_dolGetFirstLastname 
fix #8521
 2018-04-11 14:54:15 +02:00