lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
65,520 Commits 43 Branches 150 Tags 886 MiB
852bf8dab7
Commit Graph

3036 Commits

Author SHA1 Message Date
Regis Houssin
093ea49cc6 Fix: use "multidir_output" instead "dir_output" 2018-02-26 11:35:30 +01:00
Laurent Destailleur
41638e6dff Fix back link of look and feel v7 2018-02-26 09:20:05 +01:00
Laurent Destailleur
003827eb06 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-25 15:01:19 +01:00
Laurent Destailleur
1f60d9ba81 Fix travis 2018-02-25 13:14:55 +01:00
Laurent Destailleur
6c16f2af1e
Merge pull request #8226 from hregis/7.0_multicompany 
Fix: differentiate sharing of "member" and "member_type"
 2018-02-25 12:54:51 +01:00
Laurent Destailleur
029ef534d0 Clean deprecated code (property "special" removed from mod descriptor) 2018-02-25 10:55:02 +01:00
Laurent Destailleur
619e0d3792 FIX Bad var for substitution of free text 2018-02-24 14:03:27 +01:00
Laurent Destailleur
e2e0f23d29 FIX Bad var for substitution of free text 2018-02-24 14:01:52 +01:00
Laurent Destailleur
38d1fc27e0 Start to introduce common substitution rules for odt substitutions 2018-02-24 13:41:01 +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
03d9bf1376 Restore deprecated var 2018-02-24 12:35:36 +01:00
Laurent Destailleur
cbfe241c1b FIX Can use odx templates that does not include lines tags 2018-02-24 12:34:15 +01:00
Laurent Destailleur
daeebae647 FIX Can use odx templates that does not include lines tags 2018-02-24 12:32:48 +01:00
Regis Houssin
4c06384197 Fix: differentiate sharing of "member" and "member_type" 2018-02-24 11:13:14 +01:00
Laurent Destailleur
812911bd44 Fix type of expense report output in PDF 2018-02-23 15:33:42 +01:00
Laurent Destailleur
f002c84a76 Fix type of expense report output in PDF 2018-02-23 15:33:00 +01:00
Laurent Destailleur
0d0451e5c7 Code comment 2018-02-21 22:43:03 +01:00
Laurent Destailleur
b4446764f8 Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
Laurent Destailleur
0ff148da1f Fix import of chart account 2018-02-21 11:22:27 +01:00
Laurent Destailleur
15ba0c3b49 Close #7989 Merge manually in existing class 2018-02-20 15:35:42 +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
7722f004c8 FIX #8153 2018-02-15 14:08:42 +01:00
Laurent Destailleur
f1a9f81fb4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-02-14 22:19:59 +01:00
Laurent Destailleur
7f8cbc0f62 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/adherents/type.php
	htdocs/contrat/services.php
	htdocs/contrat/tpl/linkedobjectblock.tpl.php
	htdocs/install/upgrade2.php
 2018-02-14 22:08:18 +01:00
atm-quentin
144c13998a NEW_einstein_pdf_modules 2018-02-13 09:51:33 +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
a4f48fcfb6 Fix feature must be hidden (not stable) 2018-02-12 16:09:22 +01:00
Laurent Destailleur
109c447171 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 03:21:37 +01:00
Laurent Destailleur
c03ceb2205 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-12 02:56:51 +01:00
Laurent Destailleur
eb8664e649 NEW Can export leave requests 2018-02-09 16:08:28 +01:00
atm-ph
b074f580db Fix can't update $nblignes on beforePDFCreation if we update $object->lines 2018-02-08 16:59:17 +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
dde631c97b
Merge pull request #8149 from frederic34/patch-8 
NEW Add delivery_time_days of suppliers in export profile
 2018-02-08 14:09:33 +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
Laurent Destailleur
507328d83a Fix syntax error 2018-02-07 17:50:16 +01:00
Laurent Destailleur
37afc58c48 The module ExpenseReport use numbering rules that you can setup (like 
other modules do). If you need to keep the hard coded numbering rule of
expenses report used in 6.0, just add constant
EXPENSEREPORT_USE_OLD_NUMBERING_RULE to 1.
 2018-02-07 17:45:13 +01:00
Laurent Destailleur
cb5d0b1677 Fix compatibility option EXPENSEREPORT_USE_OLD_NUMBERING_RULE 2018-02-07 17:43:16 +01:00
Laurent Destailleur
510fc22172 Fix expense report 2018-02-07 17:01:14 +01:00
Laurent Destailleur
d8872a412b Fix numbering for expense report 2018-02-07 15:52:57 +01:00
atm-ph
6254e20c67 Fix position if module use pdf hook "linkedobjects" 2018-02-07 15:41:39 +01:00
Frédéric FRANCE
1cff0593f8
Update modProduct.class.php 2018-02-07 10:42:21 +01:00
Frédéric FRANCE
c39f5ed26a
Update pdf_rouget.modules.php 2018-02-07 09:00:47 +01:00
Laurent Destailleur
ea92f6beae Fix for multicompany 2018-02-06 10:57:53 +01:00
Laurent Destailleur
930d58ab96 Fix import supplier product price vat 2018-02-06 10:03:06 +01:00
Laurent Destailleur
4cfec30f93 Start to work on PDF template for timesheet 2018-02-05 15:35:55 +01:00
Laurent Destailleur
51847dfa8a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2018-02-05 15:34:50 +01:00
Laurent Destailleur
72f6b2956a Fix: pagination into belugo template 2018-02-05 14:31:39 +01:00
Laurent Destailleur
775085e1b8 Border of comment box 2018-02-05 14:10:24 +01:00
Laurent Destailleur
13e71306ac Start to work on payment import 2018-02-05 02:27:48 +01:00
Laurent Destailleur
8fe773204e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-04 23:18:33 +01:00
Laurent Destailleur
5455ab3280 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/projet/card.php
 2018-02-04 23:17:09 +01:00
Laurent Destailleur
f3700b66c6 Fix size of columns when using PRODUCT_USE_UNIT 2018-02-04 11:17:45 +01:00
Laurent Destailleur
5c6dd0b061 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-03 19:00:04 +01:00
Laurent Destailleur
fa3f06aaaa
Merge pull request #8123 from atm-florian/7.0 
fix warning class declaration
 2018-02-03 16:33:39 +01:00
Laurent Destailleur
756f8a1b9f
Update modules_expensereport.php 2018-02-03 16:33:27 +01:00
Laurent Destailleur
97a29e87ea Fix pdf template baleine (pb with page breaks and long task desc) 2018-02-03 16:31:36 +01:00
Laurent Destailleur
a41847d084 Fix: date of modificaiton in ledger not visible. 
Fix: show hours in date of creation in ledger.
Fix: label in export.
Fix: label in export of draft journal is same than on screen.
Fix: missing line desc in csv export of draft bank journal.
 2018-02-02 14:27:07 +01:00
florian HENRY
5d20af7751 fix warning class declaration 2018-02-01 16:15:57 +01:00
Laurent Destailleur
7f9d6a5458 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/paybox/newpayment.php
	htdocs/public/payment/newpayment.php
	htdocs/public/paypal/newpayment.php
	htdocs/public/stripe/newpayment.php
 2018-01-31 20:25:24 +01:00
Laurent Destailleur
b49a7e245c Add hidden option INVOICE_NO_PAYMENT_DETAILS required by some countries 2018-01-31 20:22:19 +01:00
Laurent Destailleur
8d983717a3
Merge pull request #8068 from atm-quentin/NEW_filter_export_model_by_user 
NEW export filter models can be share or not by user
 2018-01-29 21:19:50 +01:00
Laurent Destailleur
e9441f7881 Fix name of log module to avoid confusion with blocked log 2018-01-25 17:56:46 +01:00
Laurent Destailleur
3987033aab Fix substitution in public notes of pdf 2018-01-21 20:53:36 +01:00
atm-quentin
ce29331c05 NEW Filter export model by user 2018-01-18 12:34:22 +01:00
Laurent Destailleur
3d34a839a3 Doc 2018-01-15 17:43:18 +01:00
Laurent Destailleur
e56d74f5c4 Fix generation of doc for supplier payment 2018-01-11 19:01:47 +01:00
Laurent Destailleur
0b893c11fd Revert "Fix wrong address used into PDF model of supplier payment" 
This reverts commit 22d92c0540.
 2018-01-11 18:09:05 +01:00
Laurent Destailleur
90ddfc3f7f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/translation.php
 2018-01-11 01:14:20 +01:00
Laurent Destailleur
0ae02d76a3
Merge pull request #8049 from fmarcet/6.0 
Fix: Still using property ->client instead of ->thirdparty.
 2018-01-11 01:03:47 +01:00
Laurent Destailleur
af6b84ba3a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/contact/document.php
	htdocs/product/list.php
 2018-01-11 01:03:13 +01:00
Laurent Destailleur
f2b8c3c97d Fix check of customer/supplier code 2018-01-10 18:19:54 +01:00
Ferran Marcet
d99535d9da Fix: Still using property ->client instead of ->thirdparty. 2018-01-10 16:40:43 +01:00
atm-ph
22d92c0540 Fix wrong address used into PDF model of supplier payment 2018-01-08 15:25:18 +01:00
Laurent Destailleur
836a94fab2
Merge pull request #7988 from OPEN-DSI/core_pdf_modele_propal_payment_mode_flag 
Fix PROPALE_PDF_HIDE_PAYMENTTERMMODE and SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE
 2017-12-28 07:18:57 +01:00
Laurent Destailleur
d1cfbc2906 Code comment 2017-12-22 01:03:40 +01:00
KHELIFA
d069ccdb7f Core Modele PDF: Fix globale variable for hide payment mode with PROPALE_PDF_HIDE_PAYMENTTERMMODE and SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE 
- Fix hide payment condition for supplier proposal
 2017-12-21 16:58:37 +01:00
Laurent Destailleur
2e87318b58 Fix sql error 2017-12-18 19:15:42 +01:00
Laurent Destailleur
9f2a42b67d NEW Can filter on user on unalterable log 2017-12-16 21:50:58 +01:00
Laurent Destailleur
4abcbae79f NEW The unalterable log can be browse by any user with he permission 2017-12-16 21:36:36 +01:00
Laurent Destailleur
394eeb3cd9 Fix rendering MD files of images by adding a css 2017-12-16 15:11:40 +01:00
Laurent Destailleur
5af153550d Debug blockedlog: 
- Add a track into log when we disable/enable module
- Add a protection to avoid disable of module when recording was started
- Better compatibility with multicompany
- Can filter on ref and amount
- Add a permission to read the blockedlog
- Add more information on payments/invoice/thirdparty into log
- Reset of module data after a migration from v6 (not compatible)
 2017-12-15 16:56:08 +01:00
Laurent Destailleur
9a08ee269e Menu not visible 2017-12-14 23:43:04 +01:00
Laurent Destailleur
4a9b61047f Filter on blockedlog 2017-12-14 17:08:43 +01:00
Laurent Destailleur
e3dcff7f5b Fix substition for menus title and urls 2017-12-09 15:35:01 +01:00
Laurent Destailleur
95cb5025a2 Fix length of month too large 
More complete template
 2017-12-08 16:15:41 +01:00
alexis Algoud
62cd77d999 NEW automatic activation of external module on country set 2017-12-08 10:13:03 +01:00
Alexis Algoud
ad46bf9a94 NEW option to avoid countries to disable there blockedlog 2017-12-05 18:30:48 +01:00
alexis Algoud
a2df87ab15 NEW warning on module blocked log reset if country code is FR 
fix wrong paste click
 2017-12-05 11:40:42 +01:00
Laurent Destailleur
1ce155728f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/mailings/fraise.modules.php
 2017-12-01 16:25:13 +01:00
Laurent Destailleur
09e611aa21 Move status of blockedlog to experimental 2017-12-01 13:41:37 +01:00
ptibogxiv
c194538609
Update fraise.modules.php 2017-11-29 10:45:16 +01:00
ptibogxiv
883c9dbf99
Fix for multicompany 
last fix for multicompany compliance
 2017-11-29 09:28:03 +01:00
Laurent Destailleur
3b98a06ebb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/mailings/fraise.modules.php
 2017-11-28 12:18:01 +01:00
Laurent Destailleur
07bdd3213a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-28 12:16:13 +01:00
Laurent Destailleur
f8d6897888 Fix bug 2017-11-28 12:08:04 +01:00
ptibogxiv
10b0eafba7
Update fraise.modules.php 2017-11-27 18:12:52 +01:00
ptibogxiv
ea9071512d
Update fraise.modules.php 2017-11-27 17:08:15 +01:00
ptibogxiv
0a5a50263d
fix for multicompany 2017-11-27 16:07:40 +01:00
ptibogxiv
a9e4fcfdca
Update fraise.modules.php 2017-11-27 15:49:28 +01:00
ptibogxiv
780e8ce470
fix for multicompany 2017-11-27 15:13:14 +01:00