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

57776 Commits

Author SHA1 Message Date
Laurent Destailleur
ce402abda2 Debut ticket module 2018-04-12 23:33:38 +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
Laurent Destailleur
1c9661d9d6 FIX Update incoterm on supplier invoice 2018-04-12 21:39:12 +02:00
Laurent Destailleur
664f57a5f0 Clean code 2018-04-12 19:13:06 +02:00
Laurent Destailleur
4b38cf5329 Fix request at wrong place 2018-04-12 18:30:07 +02:00
Laurent Destailleur
a8878c3f7e FIX #6295 2018-04-12 15:17:15 +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
2b16ee75cd Fix ref must be visible on combolist 2018-04-12 11:29:16 +02:00
Alexandre SPANGARO
251117fcce Accountancy - Small fix 2018-04-12 06:07:22 +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
885c2389af Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-11 17:58:37 +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
Laurent Destailleur
0f3d2cc8df
Merge pull request #8564 from atm-ph/fix_6.0_sellsjournal_situation_invoice 
Fix wrong amount for situation invoice in sellsjournal
 2018-04-11 17:51:00 +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
e71ea882b3
Merge pull request #8556 from sadlig/develop 
Fix value cond_reglement_id & mode_reglement_id
 2018-04-11 17:30:00 +02:00
Laurent Destailleur
9634f4c82a
Update supplier_proposal.class.php 2018-04-11 17:29:45 +02:00
Laurent Destailleur
9a83a6ad6e
Merge pull request #8546 from atm-quentin/FIX_Issue_8455 
FIX Issue #8455
 2018-04-11 17:26:13 +02:00
Laurent Destailleur
693f0da2a6
Merge pull request #8545 from atm-florian/7.0_fix8436 
fix #8436
 2018-04-11 17:23:40 +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
9fafefa0d7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-11 17:18:09 +02:00
Laurent Destailleur
0518218aed Fix regression 2018-04-11 17:17:03 +02:00
Laurent Destailleur
b68975f106 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-11 17:14:56 +02:00
Laurent Destailleur
c70e0c1cda FIX #8475 #8540 2018-04-11 17:14:34 +02:00
atm-ph
6f526eb780 Fix wrong amount for situation invoice in sellsjournal 2018-04-11 16:40:59 +02:00
Laurent Destailleur
68b4b74d80
Merge pull request #8531 from all3kcis/patch-7 
Add insertExtraFields into create/update
 2018-04-11 16:34:21 +02:00
Laurent Destailleur
701aa53bdd
Update productlot.class.php 2018-04-11 16:33:12 +02:00
Laurent Destailleur
73a8966659
Merge pull request #8538 from atm-arnaud/FIX_8389_html_in_lang_DE 
FIX #8389
 2018-04-11 16:31:36 +02:00
Laurent Destailleur
307f217d56
Merge pull request #8543 from ATM-Nicolas/fix_duplicate_events 
FIX : multiple creation of same event
 2018-04-11 16:28:32 +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
b732844e91
Merge pull request #8537 from atm-arnaud/FIX_8023_missing_escape_htmltag 
FIX #8023
 2018-04-11 16:25:33 +02:00
Laurent Destailleur
628b437e28
Update card.php 2018-04-11 16:25:05 +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
Laurent Destailleur
1f21078e08
Merge pull request #8536 from atm-florian/7.0_fix8474 
fix #8474
 2018-04-11 14:53:26 +02:00
Laurent Destailleur
ab43d9d675
Merge pull request #8544 from ATM-Marc/FIX_odt_cond_reglement 
FIX: payment term doc-specific label was not used (issue #8414)
 2018-04-11 14:52:06 +02:00