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

7495 Commits

Author SHA1 Message Date
Laurent Destailleur
789fbb6dc3 Enhance tooltips 2017-05-15 12:57:08 +02:00
Laurent Destailleur
caae7e4171 NEW It's easier to switch between sandbox and live for paypal 2017-05-14 17:05:13 +02:00
Laurent Destailleur
998254d9c6 Finish rewrite and debug of module Stripe. 2017-05-14 16:17:23 +02:00
Laurent Destailleur
9e4e72baee Enhance module stripe 2017-05-14 05:26:19 +02:00
Laurent Destailleur
57ba598b15 Merge pull request #6771 from aspangaro/6.0-stripe 
New : Module Stripe
 2017-05-13 19:55:29 +02:00
Laurent Destailleur
f8403d5020 Fix phpunit test 2017-05-12 20:01:45 +02:00
Laurent Destailleur
f6dcb2860a More complete help message 2017-05-12 19:14:54 +02:00
Laurent Destailleur
0d11fce834 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-12 15:45:30 +02:00
Laurent Destailleur
74af1223de Fix company id for US 2017-05-12 11:26:24 +02:00
Laurent Destailleur
b09300ab61 NEW Can edit background color for odd and even lines in tables 2017-05-11 13:02:29 +02:00
Laurent Destailleur
1c7d9b9d9a Merge pull request #6804 from aspangaro/6.0-multijournal 
New : Accountancy - Add a list to select the bank journal in bank card
 2017-05-10 22:46:30 +02:00
Laurent Destailleur
578eb98b33 Better user interface 2017-05-10 13:13:33 +02:00
Laurent Destailleur
c4722e3694 FIX XSS 2017-05-10 11:48:45 +02:00
Laurent Destailleur
5c33c1773f FIX XSS 2017-05-10 11:47:34 +02:00
Laurent Destailleur
1748f1d451 Better tooltip for computed field 2017-05-09 17:00:07 +02:00
Laurent Destailleur
9fe28c9b2c NEW Can disable all overwrote translations in one click. 2017-05-09 10:08:04 +02:00
Laurent Destailleur
c26d24e97d Work on module builder 2017-05-09 00:00:09 +02:00
Laurent Destailleur
dd71fdc82f Work on modulebuilder template 2017-05-08 21:00:23 +02:00
Alexandre SPANGARO
b05d2c50e8 Add mode live 2017-05-08 06:52:30 +02:00
Alexandre SPANGARO
16a41242d3 Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-05-08 06:39:14 +02:00
Alexandre SPANGARO
dd97bbdc82 Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal 2017-05-07 15:10:30 +02:00
Laurent Destailleur
910a925167 NEW Add last activation author and ip of modules 2017-05-06 20:43:14 +02:00
Laurent Destailleur
d948447600 Add button to disable all personalized default values in one click. 2017-05-06 17:08:38 +02:00
Alexandre SPANGARO
7c4b47f20d Update works 2017-05-06 08:33:12 +02:00
Laurent Destailleur
e8c60642e6 Translation fix 2017-05-06 03:21:47 +02:00
Laurent Destailleur
56140ae572 Work on default focus 2017-05-06 01:09:22 +02:00
Laurent Destailleur
885a636351 Debug new journal list page 2017-05-05 16:35:05 +02:00
Laurent Destailleur
11b1a2adac Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/comm/propal/class/api_proposals.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/bank/index.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/includes/odtphp/Segment.php
	htdocs/langs/en_US/admin.lang
	htdocs/societe/soc.php
 2017-05-05 14:49:25 +02:00
Laurent Destailleur
b7f7683e5a Merge pull request #6774 from aspangaro/6.0-multijournal 
Finish to move accountancy journals list to page like dictionnary
 2017-05-05 14:21:55 +02:00
Laurent Destailleur
dfa81bc806 Merge pull request #6792 from aspangaro/6.0-agiris 
New : Accountancy - Add export model towards Agiris
 2017-05-05 14:15:51 +02:00
Laurent Destailleur
a1ac3b470b Change menu for setup of predefined emails 2017-05-05 14:01:20 +02:00
Laurent Destailleur
65e03ca3ba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-05 12:34:22 +02:00
Laurent Destailleur
68b63927e0 Maxi miscellaneous debug 2017-05-05 12:33:49 +02:00
Laurent Destailleur
0a1ec514d2 Merge pull request #6772 from aspangaro/6.0-1 
Add option on accounting account getNomUrl
 2017-05-05 10:02:27 +02:00
Laurent Destailleur
f069ef9844 FIX #6767 2017-05-05 09:16:11 +02:00
Laurent Destailleur
768df56c07 Uniformize name of standard PDF template 2017-05-04 20:16:55 +02:00
Laurent Destailleur
2de335e2dc Action must be a verb 2017-05-04 18:49:58 +02:00
Laurent Destailleur
7d5b5cf86a Better behavior for tooltip on click 2017-05-04 13:09:42 +02:00
Laurent Destailleur
6fb8876e5a Merge pull request #6730 from fappels/5.0_fix_en_US_admin_tag 
Fix typo in en_US admin tag
 2017-05-04 09:54:21 +02:00
Laurent Destailleur
3871da0324 Merge pull request #6729 from atm-florian/dev_importexport_ressources 
NEW : Add module resources import/export
 2017-05-04 09:43:00 +02:00
Alexandre SPANGARO
29bede28f0 New : Accountancy - Add export model towards Agiris 2017-05-04 06:49:29 +02:00
Alexandre SPANGARO
e58d2f428b Merge remote-tracking branch 'uptream/develop' into 6.0-1 2017-05-01 20:31:08 +02:00
Laurent Destailleur
6e1f825190 Look and feel v6 2017-05-01 13:01:05 +02:00
Alexandre SPANGARO
cbd0598611 Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal 2017-05-01 08:16:55 +02:00
Alexandre SPANGARO
6afd0d642a Finish to move accountancy journals list to page like dictionnary 2017-05-01 08:16:09 +02:00
Alexandre SPANGARO
e11254a9bf Add option on accounting account getNomUrl 2017-04-30 15:04:51 +02:00
Laurent Destailleur
7c2b3b8df0 NEW When down payment is entered, discount to reuse into final invoice 
is automatically created. This save one click into invoice workflow.
 2017-04-30 12:55:11 +02:00
Laurent Destailleur
60951cf307 Less data example 2017-04-30 04:09:50 +02:00
Laurent Destailleur
4993a43025 Move new feature inventory into module stock. 2017-04-30 02:25:05 +02:00
Laurent Destailleur
92b5f8d85e Move new feature inventory into module stock. 2017-04-29 21:53:01 +02:00
Laurent Destailleur
f5bdfc426f Merge pull request #6584 from atm-ph/NEW_inventory_coreobject_listview 
New inventory coreobject listview
 2017-04-29 21:31:46 +02:00
Laurent Destailleur
04b1535b12 FIX Found duplicate line when it is not. 2017-04-29 14:59:40 +02:00
Laurent Destailleur
8ec44615cd FIX serious bugs in accounting (error management, transactions, bad 
values set)
 2017-04-29 14:54:21 +02:00
Alexandre SPANGARO
586ea54bfc Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-04-29 07:05:02 +02:00
Laurent Destailleur
2e6d865c7d NEW Can define default values for create forms. 
NEW Can define default filters for list pages.
NEW Can define default sort order for list pages.
 2017-04-29 00:44:25 +02:00
phf
8219ff84c8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview 2017-04-28 14:45:04 +02:00
Laurent Destailleur
676ff84a4e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-04-28 14:05:42 +02:00
Laurent Destailleur
defce63a24 Work on management of default values 2017-04-28 14:05:28 +02:00
Laurent Destailleur
c722286bcb Fix regressions 2017-04-28 13:37:36 +02:00
Laurent Destailleur
0ba6433a61 Work on module website 2017-04-28 13:10:08 +02:00
Laurent Destailleur
853c8a8e07 Fix typo 2017-04-27 18:05:53 +02:00
Laurent Destailleur
cfde27820e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/translation.php
	htdocs/comm/card.php
	htdocs/core/menus/standard/eldy.lib.php
 2017-04-27 17:20:40 +02:00
Laurent Destailleur
5e856e6923 More complete tooltip help to describe available substitution vars 2017-04-27 17:16:19 +02:00
Laurent Destailleur
1758b83604 Clean explanation for accounting module setup. 2017-04-27 13:50:13 +02:00
Laurent Destailleur
9c2ce0202d Translation 2017-04-27 13:19:36 +02:00
Laurent Destailleur
1a98c4a3ff Fix error management in adding translation key 2017-04-27 12:48:13 +02:00
Laurent Destailleur
508109d5b1 Translation 2017-04-27 00:21:00 +02:00
Laurent Destailleur
84e774ff32 Better translation 2017-04-25 12:57:20 +02:00
Alexandre SPANGARO
c3fe1c963a Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-04-22 06:33:31 +02:00
florian HENRY
10541e0c53 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_importexport_ressources 2017-04-19 14:48:06 +02:00
Laurent Destailleur
50210d0dd6 NEW Add tooltip help on shipment weight and volume calculation 2017-04-18 17:04:56 +02:00
fappels
433b9e6fe1 Fix typo in en_US admin tag 2017-04-18 16:22:39 +02:00
florian HENRY
a52db08cd6 NEW : Add module resources import/export 2017-04-18 15:25:04 +02:00
Laurent Destailleur
9456f7091e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-04-18 01:36:33 +02:00
Laurent Destailleur
82f9555c6b Translation 2017-04-18 01:35:58 +02:00
Laurent Destailleur
0994622bf8 NEW Can use translations into all substitutions (watermark, freetext...) 2017-04-17 23:54:09 +02:00
Alexandre SPANGARO
fed6d71d8a Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-04-17 06:51:02 +02:00
Laurent Destailleur
e97e202deb NEW Can import users 2017-04-17 04:22:53 +02:00
Laurent Destailleur
4c056d68d8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/commande/list.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/bills.lang
	htdocs/societe/list.php
 2017-04-15 17:02:05 +02:00
Laurent Destailleur
b0442aa56a Better explanation on label that are translated. 2017-04-14 19:48:01 +02:00
Laurent Destailleur
e6e9b65594 NEW Reduce memory usage by removing deprecated constant loading. 2017-04-14 12:38:52 +02:00
Laurent Destailleur
db23a5222b Fix translation 2017-04-13 15:12:19 +02:00
Laurent Destailleur
3e9ccc186a NEW Small PDF template for products 2017-04-13 10:26:12 +02:00
Laurent Destailleur
a6b05bb4da Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0 2017-04-12 14:08:58 +02:00
Laurent Destailleur
0417eb3862 Merge pull request #6686 from guillaume-uH57J9/develop 
NEW Improve public member subscription form with member type
 2017-04-11 11:31:25 +02:00
Laurent Destailleur
759315aef5 NEW Mass action delete available on project and tasks 2017-04-11 02:48:16 +02:00
Laurent Destailleur
d15792bdf4 Minor fix 2017-04-11 00:59:47 +02:00
Laurent Destailleur
06f9c1989b Work on default values 2017-04-10 13:14:31 +02:00
Laurent Destailleur
f1ae0eb7c6 Default value 2017-04-10 12:51:52 +02:00
Guillaume
f427c8441a add translation strings for ForceMemberType 2017-04-09 22:49:48 +02:00
Laurent Destailleur
ddd101757e FIX Bulk pdf merge on supplier proposals 2017-04-09 13:26:26 +02:00
Laurent Destailleur
76af83ce06 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-04-08 14:06:25 +02:00
Laurent Destailleur
7f7ba6279a Fix translation 2017-04-08 14:02:07 +02:00
Laurent Destailleur
aa47575b13 Serious debug of variant module. No more fu.. js errors on smarpthone. 2017-04-07 12:31:08 +02:00
Laurent Destailleur
ea44e14b60 Start debug the variant module 2017-04-07 11:01:12 +02:00
Laurent Destailleur
f598bf8bef Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-04-06 21:59:11 +02:00
Laurent Destailleur
8363bee234 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/filefunc.inc.php
 2017-04-06 21:56:48 +02:00
Laurent Destailleur
fe4f71296f FIX #6636 Complete fix 2017-04-06 21:55:23 +02:00
Laurent Destailleur
e2b96abd0b Fix translation 2017-04-05 13:34:52 +02:00
Laurent Destailleur
9df4bac202 NEW Bookmarks are into a combo list. 2017-04-04 11:56:19 +02:00
Laurent Destailleur
4902df7e3f Work on look and feel v6 2017-04-02 19:28:38 +02:00
Laurent Destailleur
cab944a1a1 Merge pull request #6602 from aspangaro/6.0-multijournal 
New : [FP17] Accounting multi-journals
 2017-03-31 17:45:10 +02:00
Laurent Destailleur
01a74a8d23 Work on 6.0 look and feel 2017-03-31 17:41:20 +02:00
Laurent Destailleur
979bcd3a9b NEW Can add a background image on login page 2017-03-31 11:40:31 +02:00
Laurent Destailleur
18e1e5b780 NEW Add "depends on" and "required by "into module informations 2017-03-30 15:54:48 +02:00
Laurent Destailleur
8e70c4a0b7 Work on 6.0 new look and feel 2017-03-30 15:39:50 +02:00
Laurent Destailleur
aca1c1944d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/data/llx_c_action_trigger.sql
 2017-03-30 12:02:27 +02:00
Laurent Destailleur
ce7368d10e Fix events create from member card not linked to member 2017-03-30 11:51:07 +02:00
Laurent Destailleur
78cc976e9f Work on module builder 2017-03-30 10:40:15 +02:00
Laurent Destailleur
4df8dcf980 Work on module modBlockedLog and modModuleBuilder 2017-03-29 21:50:15 +02:00
Laurent Destailleur
e3d3d32b4a Translation 2017-03-29 11:11:37 +02:00
Alexandre SPANGARO
06c2f04927 Finish work on multijournal admin part 
Need harmonization on rights
 2017-03-29 06:32:26 +02:00
Laurent Destailleur
c84e20abaf Fix translation 2017-03-28 21:05:11 +02:00
phf
df170769c9 Update function module inventory 2017-03-28 16:05:18 +02:00
Alexandre SPANGARO
fc2b9a858b New : [FP17] Add multijournals in accountancy admin 2017-03-28 06:35:03 +02:00
Laurent Destailleur
219bcb0d54 Work on 6.0 features. 2017-03-27 22:44:50 +02:00
atm-ph
76b95aeec0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview 2017-03-25 19:15:25 +01:00
Laurent Destailleur
4012aeff90 Fix translation 2017-03-25 18:35:17 +01:00
Laurent Destailleur
106d19a8af FIX #6468 + Fix missing translation 2017-03-25 03:53:11 +01:00
Laurent Destailleur
278bbf184c Merge pull request #6546 from aspangaro/6.0-new_bank_direct_input 
New : Add Various payment submodule linked to the accountancy to replace free input in bank
 2017-03-24 22:52:39 +01:00
atm-ph
edc2d39702 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview 2017-03-24 17:06:40 +01:00
Laurent Destailleur
3cc312d485 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/main.lang
 2017-03-23 19:48:34 +01:00
Laurent Destailleur
6ab94ddbe7 Fix translation 2017-03-23 19:26:02 +01:00
Laurent Destailleur
c4b6378751 Fix english translation 2017-03-23 16:46:00 +01:00
Laurent Destailleur
3adb43c6e5 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/boxes/box_produits.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/langs/en_US/bills.lang
	htdocs/product/class/product.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2017-03-23 12:52:19 +01:00
Laurent Destailleur
a5c11dc840 NEW Add function dolMd2Html 2017-03-21 16:03:13 +01:00
Laurent Destailleur
4457bc33cd Fix english translation 2017-03-21 14:23:55 +01:00
Alexandre SPANGARO
b09398a68e Update works 2017-03-19 15:23:35 +01:00
Laurent Destailleur
4831fb4dcb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php
 2017-03-19 11:26:49 +01:00
Alexandre SPANGARO
504e1e1ec8 Step 3: Work on card 2017-03-19 07:26:15 +01:00
Laurent Destailleur
967f3f579d Fix translation 2017-03-18 20:07:37 +01:00
Laurent Destailleur
597fb11d08 Fix error management in duplicate trigger 2017-03-18 11:36:48 +01:00
Laurent Destailleur
deb91ad7c1 FIX Data lost during merge of thirdparties 2017-03-15 13:30:30 +01:00
Laurent Destailleur
7f8c4d7d0f Fix CSS 2017-03-14 14:33:25 +01:00
Laurent Destailleur
ec7d48931e Merge duplicate menus/page on projects 2017-03-14 13:49:04 +01:00
Alexandre SPANGARO
c6c07bf9f4 New : Add project to social contributions 2017-03-12 14:32:49 +01:00
Laurent Destailleur
d1fe6a408c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-11 12:41:47 +01:00
Laurent Destailleur
9d63697d2a Fix missing translation 2017-03-11 12:04:01 +01:00
Laurent Destailleur
9cbc5387ef Fix text 2017-03-11 11:41:02 +01:00
Laurent Destailleur
0ff4f7e694 Fix translation 2017-03-11 03:10:57 +01:00
Laurent Destailleur
4bf0e31299 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/loan.lang
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2017-03-11 02:40:42 +01:00
Laurent Destailleur
c0b3219c72 Missing translation 2017-03-11 00:33:04 +01:00
Laurent Destailleur
c72e7c1057 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
 2017-03-10 14:54:35 +01:00
Laurent Destailleur
fda84995e8 If manage zero is set, we must NOT set length. So we can here make a 
shortcut to avoid useless code.
 2017-03-10 11:50:57 +01:00
Laurent Destailleur
6cd53cb471 Merge pull request #6482 from aspangaro/5.0-27 
Fix : Language & revert a description of the function
 2017-03-10 11:12:42 +01:00
Laurent Destailleur
c962daabac NEW add property to show warnings when activating modules 2017-03-09 15:16:16 +01:00
Laurent Destailleur
d241adc201 NEW Use autocompletion on the "Add widget list". 2017-03-09 13:22:43 +01:00
Alexandre SPANGARO
6ce8aa7d6f Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-03-07 22:08:23 +01:00
Laurent Destailleur
5f79b2d0c6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/accountancy/admin/categories.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2017-03-05 22:11:35 +01:00
Laurent Destailleur
f67c967d0b FIX The vat rate line used when adding a predefined product was wrong if 
there is several vat line with same rate.
 2017-03-04 22:27:44 +01:00
Laurent Destailleur
6c91cb4f90 Fix it was not possible to create/edit a new chart of account 2017-03-03 17:59:49 +01:00
Laurent Destailleur
28ad50e059 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/suppliers.lang
 2017-03-03 14:31:35 +01:00
Laurent Destailleur
0a0797e797 Rename menu entry 2017-03-03 13:36:38 +01:00
Laurent Destailleur
807eb56807 Add BHD currency 2017-03-03 13:15:20 +01:00
Alexandre SPANGARO
19ce0b0d89 Fix : Language & revert a description of the function 2017-03-03 06:22:12 +01:00
Laurent Destailleur
d202003e29 Fix translation 2017-03-01 18:12:06 +01:00
Alexandre SPANGARO
05e50e1027 Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-02-28 05:52:43 +01:00
Laurent Destailleur
4f24613de0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2017-02-27 01:19:03 +01:00
Laurent Destailleur
92acbbd8a8 Fix parameters 2017-02-27 00:22:11 +01:00
Laurent Destailleur
bf591f5f91 Work on module website 2017-02-24 21:13:40 +01:00
Laurent Destailleur
fb88eaf2a4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-02-23 02:55:50 +01:00
Laurent Destailleur
92d9eb3c5d Several fix for a better management of #6424 2017-02-22 17:46:54 +01:00
Laurent Destailleur
a0fb53d5b1 Merge branch 'develop' into NEW_pdf_supplier_payment 2017-02-22 14:20:47 +01:00
Laurent Destailleur
3f3b82ed64 Merge pull request #6454 from atm-florian/dev_fix_unittrad 
fix unit trad
 2017-02-22 14:16:28 +01:00
Alexandre SPANGARO
942b58efaf New : Integration of Stripe 2017-02-22 06:33:52 +01:00
Laurent Destailleur
d5bb208957 Clean admin menu entries 2017-02-22 02:19:50 +01:00
Laurent Destailleur
fc6fb61476 Minor fix in typo 2017-02-22 02:19:05 +01:00
florian HENRY
c8de648924 fix unit trad 2017-02-21 19:07:57 +01:00
Laurent Destailleur
ebe625aa16 Fix debug direct debit module 2017-02-21 13:16:28 +01:00
Laurent Destailleur
7ab600781d NEW Move login information on home page into a widget 2017-02-21 11:57:52 +01:00
Laurent Destailleur
992f292a05 Translation 2017-02-21 10:59:49 +01:00
Laurent Destailleur
eef3824f8c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/categories.php
	htdocs/admin/dict.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/bills.lang
 2017-02-21 10:34:52 +01:00
Laurent Destailleur
6c40110613 Sync transifex 2017-02-21 10:26:11 +01:00
Laurent Destailleur
68ded1b4c3 Fix language 2017-02-20 19:30:34 +01:00
Laurent Destailleur
3e2c0d26f2 Fix MVC 2017-02-20 11:59:58 +01:00
Laurent Destailleur
a8129ce46e Fix transaction/sql error 2017-02-20 11:49:27 +01:00
Laurent Destailleur
89d10ae5aa Fix the accounting account groups must be editable by book keeper, not 
admin user.
 2017-02-20 11:21:38 +01:00
Laurent Destailleur
501f118f92 Fix style 2017-02-19 22:53:29 +01:00
Laurent Destailleur
fd111cb1c6 NEW tooltip can be on hover or on click with textwithpicto function. 2017-02-17 17:11:14 +01:00
arnaud
951ea51285 FIX translate model admin 2017-02-17 16:44:57 +01:00
arnaud
4ec664029d Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment 2017-02-17 16:40:14 +01:00
arnaud
fc0abe659a NEW PDF with numbertoword 2017-02-17 16:39:36 +01:00
Laurent Destailleur
8d03f86f45 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-17 13:10:46 +01:00
Laurent Destailleur
0e6c329695 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-17 13:10:03 +01:00
Laurent Destailleur
a91d57037e FIX #6433 2017-02-17 13:09:28 +01:00
Laurent Destailleur
bde6815e5d Merge pull request #6425 from GPCsolutions/5.0-multicurrency-error 
Fix: [Multicurrency] properly display API error
 2017-02-17 10:45:45 +01:00
Laurent Destailleur
498473715e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-17 01:48:43 +01:00
Laurent Destailleur
afa5ef2913 NEW Introduce fields that can be computed during export in export 
profiles.
 2017-02-17 00:19:28 +01:00
Laurent Destailleur
9778ca414a Better translation 2017-02-17 00:07:02 +01:00
Raphaël Doursenaud
d9f32f7ae1
Fix: [Multicurrency] properly display API error 2017-02-15 13:20:38 +01:00
Laurent Destailleur
868f2e5473 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/update.php
	htdocs/core/lib/functions.lib.php
 2017-02-13 01:36:02 +01:00
Laurent Destailleur
ae740b7c1b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2017-02-13 01:19:30 +01:00
Laurent Destailleur
bf32acaadd Fix control of module format. 2017-02-13 01:13:41 +01:00
Laurent Destailleur
05c9f57fd4 Move edition of emails templates out of dictionaries so we would be able 
to have templates per user (not reserved to admin).
 2017-02-12 18:13:49 +01:00
Laurent Destailleur
f34e0b1bdb NEW Can deploy an external module from the module setup area. 2017-02-11 15:41:01 +01:00
Laurent Destailleur
4723eac227 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-11 13:56:39 +01:00
Laurent Destailleur
b9db7eba1b Fix: deployement of a module 2017-02-10 19:14:58 +01:00
Laurent Destailleur
f6a8aacc8d Fix: deployement of a module 2017-02-10 18:42:59 +01:00
Laurent Destailleur
d72e5a3646 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-10 17:34:23 +01:00
Laurent Destailleur
97eebe164c Better translation 2017-02-10 17:09:56 +01:00
Laurent Destailleur
44ab6ad9b7 NEW Can control constants values into file integrity checker 2017-02-10 17:05:45 +01:00
Laurent Destailleur
66542b6367 Fix translation and link to direct debit payment 2017-02-10 10:43:54 +01:00
Laurent Destailleur
767e842c68 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-09 01:08:17 +01:00
Laurent Destailleur
ad361d6d45 Merge pull request #6394 from aspangaro/6.0-fiscalyear 
[FP17] Accountancy - Prepare fiscal year
 2017-02-08 19:25:02 +01:00
Laurent Destailleur
4d16540207 Merge pull request #6393 from aspangaro/6.0-export 
NEW : [FP17] Accountancy - Add export of charts of accounts
 2017-02-08 19:22:26 +01:00
Laurent Destailleur
596c092ec8 Merge pull request #6219 from atm-florian/dev_changelistchild 
NEW : Allow extrafields list select to be dependands on other standard list and not only other extrafields list
 2017-02-08 16:49:18 +01:00
Laurent Destailleur
f4e64685e8 Merge pull request #6397 from apachler/develop 
added additional payment terms often needed in Austria
 2017-02-08 16:47:40 +01:00
Laurent Destailleur
6fef6ac2fb Optimize code and performance of module variant 2017-02-08 14:07:54 +01:00
Andreas Pachler
ae3ace7e94 added additional payment terms often needed in Austria 2017-02-08 12:46:42 +01:00
Laurent Destailleur
e1a6e6e4ab Rename "attributes" into "variants" to avoid confusion with extrafields 2017-02-08 12:37:38 +01:00
Laurent Destailleur
b24f244f67 Merge pull request #5533 from marcosgdf/prod-attr 
Feature Request: NEW Added product attributes feature
 2017-02-08 11:20:33 +01:00
Laurent Destailleur
b611c5ca53 Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received 
NEW Develop new reduc on excess received
 2017-02-08 11:16:10 +01:00
Laurent Destailleur
31c3398b7f Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/modules.php
 2017-02-08 10:59:05 +01:00
Alexandre SPANGARO
4126dcff03 [FP17] Accountancy - Prepare fiscal year for a better complete accountancy. For the moment, remove function to update status and delete a fiscal year. Need controls and a specific function to block lines in the book keeping if the fiscal year is closed. 2017-02-08 06:51:42 +01:00
Alexandre SPANGARO
e4fc52497e New : [FP17] Accountancy - Add export of charts of accounts 2017-02-08 06:18:56 +01:00
Laurent Destailleur
0a797cd12e Fix us terms. 2017-02-07 20:08:15 +01:00
Laurent Destailleur
fbff32823a Fix translation 2017-02-07 12:43:12 +01:00
Laurent Destailleur
b0ee04c079 FIX #6379 2017-02-07 01:13:50 +01:00
Laurent Destailleur
6b528b2bea Fix translation: Open -> opened (open is for "mind/spirit", opened is 
the adjective for a status)
 2017-02-06 21:34:05 +01:00
Laurent Destailleur
fcbc12ce31 Merge pull request #6344 from atm-ph/new_link_movement_stock_to_project 
New link movement stock to project
 2017-02-06 20:45:04 +01:00
Laurent Destailleur
a4bbcd866b Merge pull request #6372 from atm-arnaud/NEW_supplier_paiements_report 
NEW Add supplier paiements report
 2017-02-06 20:29:42 +01:00
Laurent Destailleur
9220a638b5 NEW Filechecker can include custom dir and report added files. 2017-02-06 15:29:07 +01:00
Laurent Destailleur
6cb3199824 Translation message 2017-02-06 12:03:20 +01:00
Laurent Destailleur
f9c510f4fb More complete translation 2017-02-04 11:34:29 +01:00
arnaud
6d3e43ddaf NEW Report page and menu for suppliers paiements 2017-02-03 16:34:14 +01:00
Laurent Destailleur
e232a5a444 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-03 15:36:05 +01:00
Laurent Destailleur
5381eadc75 Fix translation 2017-02-03 15:33:44 +01:00
Laurent Destailleur
bd812a0bef NEW new demo entry page 2017-02-03 14:48:16 +01:00
Marcos García de La Fuente
d06fb423c0 Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/core/class/html.form.class.php
#	htdocs/fourn/commande/card.php
#	htdocs/fourn/facture/card.php
#	htdocs/langs/en_US/products.lang
 2017-02-02 20:07:41 +01:00
Laurent Destailleur
cd6f5fb8cb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-02 02:26:09 +01:00
Laurent Destailleur
13f37b2cb9 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-02 02:25:49 +01:00
Laurent Destailleur
c657d193ec Fix translation 2017-02-02 02:23:33 +01:00
Laurent Destailleur
4e43a815d1 Merge pull request #6359 from aspangaro/6.0-3 
Fix : [FP17] Correct some problems on category accounting account page
 2017-02-02 01:02:49 +01:00
Laurent Destailleur
c3fb559d3b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modProduct.class.php
 2017-02-01 20:58:17 +01:00
Laurent Destailleur
9a9b31c9c0 Fix cancel button + logic to close project when setting opp to WON/LOST. 2017-02-01 13:25:16 +01:00
aspangaro
2ce4ba99fe Fix : [FP17] Correct some fix on category accounting account page 2017-02-01 06:54:01 +01:00
Laurent Destailleur
fbf9986506 Fix translation 2017-01-31 18:03:25 +01:00
Laurent Destailleur
5e4509953d Associated product must be on another export profile 2017-01-29 21:25:29 +01:00
Laurent Destailleur
756919de2a Fix deadlock feature: could not solve a situation where an emailing was 
validated by error.
 2017-01-29 16:08:45 +01:00
Laurent Destailleur
b4b81d8dcb Fix css and missing translation key 2017-01-29 15:07:18 +01:00
atm-ph
ccad6d6dde New show on project "overview" tab the informations about movements stock 2017-01-29 13:36:33 +01:00
florian HENRY
cb6209de31 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_changelistchild

Conflicts:
	htdocs/core/class/commonobject.class.php
 2017-01-27 15:16:28 +01:00
Laurent Destailleur
9f1959ffc8 Fix MVC Actions must be done before output 2017-01-27 01:21:20 +01:00
Laurent Destailleur
105a53b333 Merge pull request #6333 from atm-quentin/Mass_withdrawal_request 
NEW Mass withdrawal request
 2017-01-27 00:55:16 +01:00
Laurent Destailleur
053afe21dd Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/class/user.class.php
 2017-01-26 23:40:16 +01:00
Laurent Destailleur
60ac751d84 Fix translation 2017-01-26 18:21:39 +01:00
Laurent Destailleur
c39fcce9f1 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-26 10:45:38 +01:00
florian HENRY
13917cebdc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_changelistchild 2017-01-25 11:02:23 +01:00
Quentin Vial-Gouteyron
6011c98515 FIX payment method exception 2017-01-24 12:22:23 +01:00
Quentin Vial-Gouteyron
39a92df647 Massive withdrawal request 2017-01-24 11:50:07 +01:00