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

8289 Commits

Author SHA1 Message Date
Laurent Destailleur
31eeaf9914 Trans 2018-06-09 13:46:42 +02:00
Laurent Destailleur
186df884fa Trans 2018-06-07 09:37:12 +02:00
Laurent Destailleur
74890ce656 Sync transifex 2018-06-06 12:02:33 +02:00
Laurent Destailleur
ac721b46bc Trans 2018-06-06 11:16:42 +02:00
Laurent Destailleur
35ed49e575 Trans 2018-06-06 10:42:41 +02:00
Alexandre SPANGARO
f2c04c5653 Accountancy - Show journal name on journal page and hide button draft export (Add an option in admin) 2018-06-05 20:37:39 +02:00
Laurent Destailleur
f28a6e59c8 Look and feel v8 2018-06-05 16:30:16 +02:00
Laurent Destailleur
7c82c74b6b Fix install check 2018-06-05 08:57:04 +02:00
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00
Laurent Destailleur
eca66492ce
Merge pull request #8913 from aspangaro/8.0-a26 
NEW : Accountancy Add import on general ledger
 2018-06-04 14:02:34 +02:00
Laurent Destailleur
da44ea858c Trans 2018-06-04 13:35:30 +02:00
Laurent Destailleur
29ee5dffc4 Clean code 2018-06-04 12:55:55 +02:00
Alexandre SPANGARO
a3030e4057 Update works 2018-06-03 22:35:39 +02:00
Laurent Destailleur
de59892438 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-05-30 12:13:18 +02:00
ATM-Nicolas
48a315f6cd FIX : Bad substitution key used for default send proposal email 2018-05-30 10:14:34 +02:00
Laurent Destailleur
7f77f1bd5a
Merge pull request #8825 from atm-florian/develop_advtrgtml 
new : add adv targt emailing amdin with main feature level 1
 2018-05-25 11:10:51 +02:00
Laurent Destailleur
02803f9284
Merge pull request #8821 from aspangaro/8.0-b26 
Fix Loan : Move to Loadlangs / Remove oldcode (calc) / Presentation / Small problems
 2018-05-25 10:36:46 +02:00
Laurent Destailleur
de447d88d7 Fix translation 2018-05-24 11:51:32 +02:00
Laurent Destailleur
488c0c030e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modProduct.class.php
 2018-05-23 18:09:25 +02:00
Laurent Destailleur
4967c678b8 Fix translation 2018-05-23 18:05:19 +02:00
Laurent Destailleur
f074daae48 Fix option MAIN_MAIL_ENABLED_USER_DEST_SELECT 2018-05-22 20:17:31 +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
florian HENRY
22cdbffb0a new : add adv targt emailing amdin with main feature level 1 2018-05-21 10:58:16 +02:00
Alexandre SPANGARO
c41a9291f1 Fix some problems & presentation 2018-05-20 07:46:02 +02:00
Alexandre SPANGARO
a4d3c4bed0 Fix language 2018-05-20 06:16:12 +02:00
Laurent Destailleur
e724cfd6a2
Merge pull request #8802 from atm-john/new_avoir_situation 
Add credit note compatibility with situation invoice.
 2018-05-18 11:34:10 +02:00
Laurent Destailleur
e503aeb2e5
Merge pull request #8787 from aspangaro/8.0-a24 
Update module assets
 2018-05-18 09:05:46 +02:00
Laurent Destailleur
1581e73906 Trans 2018-05-17 18:04:30 +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
Laurent Destailleur
3e27d7dd2a Report of turnover by vat rate / product type / country 2018-05-15 17:51:19 +02:00
Laurent Destailleur
d52305cef8 NEW Add entry for the GDPR contact 2018-05-15 11:50:42 +02:00
Laurent Destailleur
0c40dfa3f9 Translation 2018-05-13 14:30:48 +02:00
Alexandre SPANGARO
cb815e5e3b Update works 2018-05-13 07:50:24 +02:00
Alexandre SPANGARO
9c6f92986e Upgrade works 2018-05-11 21:48:22 +02:00
Laurent Destailleur
f5f734e8ef
Merge pull request #8756 from bafbes/abb7003 
New : Translate accountancy journal menu entries
 2018-05-10 11:58:26 +02:00
ATM-Nicolas
fb9ace010f FIX : Missing translations 2018-05-07 17:16:20 +02:00
Abbes Bahfir
de8bd3f886 New : Translate accountancy journal menu entries 2018-05-07 08:43:41 +01:00
Abbes Bahfir
17b8de2cdd New : Option INVOICE_CAN_REMOVE_DRAFT_ONLY to delete draft invoices with precedence over INVOICE_CAN_ALWAYS_BE_REMOVED 2018-05-05 12:57:29 +01:00
Laurent Destailleur
564d791697
Merge pull request #8710 from atm-quentin/develop 
NEW cancel orders on massaction
 2018-05-05 12:54:31 +02:00
Laurent Destailleur
5cff4c152b Add tab "time spent" in project view. Can swith gantt/list. 2018-05-04 11:25:21 +02:00
atm-quentin
f70df3490f FIX add db commit 2018-05-03 10:53:24 +02:00
Laurent Destailleur
b21059ac25 Translation 2018-05-01 00:50:47 +02:00
Laurent Destailleur
9eea58e4c5 Translation 2018-04-30 20:19:28 +02:00
Laurent Destailleur
1bf56e58b3 Work on vat report 2018-04-30 18:21:04 +02:00
Laurent Destailleur
4c12369a26 Debug module ticket 2018-04-30 10:33:36 +02:00
Laurent Destailleur
19c12f3103 Translation 2018-04-30 09:31:09 +02:00
Laurent Destailleur
55f982e504 Removed deprecated FPDI option and reorganise PDF setup page 2018-04-30 09:28:24 +02:00
Laurent Destailleur
98ff3868a9 Fix translation 2018-04-29 20:11:17 +02:00
Laurent Destailleur
82a8513aed Standardize code 2018-04-29 19:52:14 +02:00
Laurent Destailleur
e168240ab0 Debug module DAV 2018-04-29 18:32:15 +02:00
Laurent Destailleur
e8fd5ea5cd Better translation 2018-04-28 17:18:38 +02:00
Laurent Destailleur
94d6e178f7 Work on vat report code rewrite 2018-04-28 16:06:46 +02:00
Laurent Destailleur
07b9a9b44d Better US english 2018-04-28 13:08:09 +02:00
Laurent Destailleur
257dc1cf77 Work on rewriting VAT reports 2018-04-27 19:17:34 +02:00
Laurent Destailleur
39aef07c6b FIX Only voters can send comments in public survey page 2018-04-25 17:14:18 +02:00
Laurent Destailleur
59d0e9a64f trans 2018-04-25 12:36:16 +02:00
Laurent Destailleur
ae412f228d NEW Experimental DAV module provides a public and private directory 2018-04-25 12:22:02 +02:00
Laurent Destailleur
6aa2ca7462
Merge pull request #8659 from aspangaro/8.0-a24 
Fix Accountancy
 2018-04-22 20:30:42 +02:00
Alexandre SPANGARO
034f7d56e4 Invert credit debit 2018-04-22 06:49:04 +02:00
Laurent Destailleur
f6743484dd Better support of option COMPANY_AQUARIUM_CLEAN_REGEX 2018-04-21 00:58:42 +02:00
Laurent Destailleur
38d200d8a6 Fix left menu 2018-04-20 13:23:34 +02:00
Laurent Destailleur
9107701b8b Move info into the README.md that is shown automatically. 2018-04-20 10:20:34 +02:00
Laurent Destailleur
9df179f48a Clean lang file 2018-04-20 10:09:26 +02:00
Laurent Destailleur
7baf0eddbc NEW Add hidden option COMPANY_AQUARIUM_CLEAN_REGEX to clean generated 
accounting account.
 2018-04-20 01:10:57 +02:00
Laurent Destailleur
16e27a445b Sort type of email template combo list 2018-04-19 20:42:03 +02:00
Laurent Destailleur
8aab183567 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-19 14:00:18 +02:00
Laurent Destailleur
fb3cae9ad3 Fix translation of country for GB 2018-04-18 11:36:44 +02:00
Laurent Destailleur
7256edc831 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-18 03:28:50 +02:00
Alexandre SPANGARO
e0c0f7fd9b Fix Accountancy 2018-04-17 20:04:55 +02:00
Laurent Destailleur
eb3b351e83 Transifex sync 2018-04-17 16:17:07 +02:00
Laurent Destailleur
faea6861c3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/invoicetemplate_list.php
	htdocs/langs/en_US/bills.lang
 2018-04-16 18:19:21 +02:00
Laurent Destailleur
622042e9b2 FIX Max nb of generation of recurring invoice should not show warning 2018-04-16 15:05:35 +02:00
Laurent Destailleur
0d26bdcdc5 FIX Button receive products not visible 2018-04-16 11:20:29 +02:00
Laurent Destailleur
d549090290 Fix translation of button action must be a verb 2018-04-16 11:12:56 +02:00
Laurent Destailleur
72de21537c Clean code 2018-04-15 20:09:09 +02:00
Frédéric FRANCE
9a001ed203
Translation 2018-04-14 09:51:11 +02:00
atm-quentin
ba5ac47602 NEW OnSearchAndListGoOnCustomerOrSupplierCard conf 2018-04-13 15:48:58 +02:00
Laurent Destailleur
519ee64c1f Translation 2018-04-13 00:42:08 +02:00
Laurent Destailleur
ace55ba569 Debug usage of extrafields for ticket module 2018-04-12 23:17:46 +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
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
7adbc473c9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-11 13:26:37 +02:00
Laurent Destailleur
b652c53379 Sync transifex 2018-04-11 13:26:23 +02:00
Laurent Destailleur
ea35a445a1
Merge branch 'develop' into 8.0-a15 2018-04-11 13:17:12 +02:00
Laurent Destailleur
bf1e3705fb Fix english 2018-04-11 12:47:10 +02:00
Laurent Destailleur
aa3c81c8bd Translation 2018-04-11 10:15:54 +02:00
Laurent Destailleur
5cdebb4daa Fix typo 2018-04-11 10:00:53 +02:00
Laurent Destailleur
0dea2b08c2 Fix english translation of nb 2018-04-10 16:39:45 +02:00
Laurent Destailleur
7df0d01e01 Fix translation 2018-04-10 16:30:18 +02:00
Laurent Destailleur
a06c9df86c Fix translation 2018-04-10 16:01:32 +02:00
atm-arnaud
26e9f10833 FIX #8389 2018-04-10 14:52:16 +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
6529043182 Clean code 2018-04-08 10:49:59 +02:00
Laurent Destailleur
98b9f6bb47 DAV module 2018-04-07 19:12:41 +02:00
Laurent Destailleur
4d2d9193b9 Work on VAT reports to use option MAIN_INFO_VAT_RETURN 2018-04-07 15:47:13 +02:00
Alexandre SPANGARO
741a14993a NEW Add file number in accountant card and update export filename 2018-04-07 06:21:49 +02:00
Laurent Destailleur
ee870342ef Fix navigation/translation 2018-04-06 20:22:20 +02:00
Laurent Destailleur
049b9b2a5f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-06 14:19:25 +02:00
Laurent Destailleur
8e778df0ff Debug stripe module 2018-04-06 14:05:07 +02:00
Alexandre SPANGARO
06dc70df09 Merge remote-tracking branch 'uptream/develop' into 8.0-a13 2018-04-05 20:42:28 +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
9d9f3ddf85
Merge pull request #8502 from ATM-Marc/NEW_create_from_list 
NEW: generalize use of button to create new element from list
 2018-04-05 16:40:15 +02:00
Laurent Destailleur
b59d8a6473
Merge pull request #8501 from ATM-Consulting/develop_atm 
NEW: send mails from project card
 2018-04-05 16:39:06 +02:00
florian HENRY
cc0fb830b8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-04-05 10:53:17 +02:00
Frédéric FRANCE
90957b3a72
Update mails.lang 2018-04-04 16:00:33 +02:00
John
ce24ca08ee move list of situation table and fix credit note display 2018-04-04 12:33:48 +02:00
John
299859d0c4 add action to remove from cycle 2018-04-03 17:34:20 +02:00
John
70321a8b71 add button to remove from cycle 2018-04-03 15:12:44 +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
Alexandre SPANGARO
2a50e9e6c4 Merge remote-tracking branch 'uptream/develop' into 8.0-a13 2018-04-02 19:54:30 +02:00
Alexandre SPANGARO
3779b6ff1c Update work on assets type 2018-04-02 08:22:26 +02:00
Alexandre SPANGARO
3799713c04 Update works 2018-04-02 06:27:55 +02:00
Alexandre SPANGARO
a5428cc8c7 NEW Module Assets 2018-04-01 21:26:52 +02:00
Laurent Destailleur
a9ac7e1f29 Debug inventory module 2018-03-31 19:20:38 +02:00
Marc de Lima Lucio
0366e645d5 NEW: generalize button to create object from list, for most of the lists 2018-03-30 16:54:38 +02:00
Marc de Lima Lucio
1cc816ff38 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-03-29 17:36:30 +02:00
Laurent Destailleur
b5c53e9d76
Merge pull request #8469 from ATM-Marc/NEW_product_default_warehouse 
NEW: default warehouse field for products
 2018-03-29 13:51:37 +02:00
Laurent Destailleur
22d64a2768 Dolibarize module ticket 2018-03-29 12:50:03 +02:00
Marc de Lima Lucio
9ba902504e FIX: langs 2018-03-29 09:38:16 +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
Marc de Lima Lucio
3646374976 NEW: default warehouse field for products + prefill warehouses when dispatching supplier orders 2018-03-28 11:54:21 +02:00
Laurent Destailleur
460344fbfb Traduction 2018-03-27 16:02:06 +02:00
Laurent Destailleur
d1e9a4719b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/accountancy/supplier/index.php
 2018-03-27 12:27:15 +02:00
Laurent Destailleur
a3851ec32a Sync transifex 2018-03-27 12:23:39 +02:00
Laurent Destailleur
b44e791c0a Work on vat reports 2018-03-26 21:39:18 +02:00
Laurent Destailleur
9f11cf77df Merge ticket css in main css 2018-03-26 15:45:56 +02:00
Laurent Destailleur
89bf781fe6 FIX Add warning when expense report line not into range 
FIX Name of user not visible on journalizing expense report payments
FIX Only approved expense report must be journalized
 2018-03-26 14:13:40 +02:00
Laurent Destailleur
8102ae6705 Work on setup for vat of product payments 2018-03-25 18:25:52 +02:00
Laurent Destailleur
8a3e6a0750 More logical setup behavior 2018-03-25 17:53:32 +02:00
florian HENRY
ffbeb17ec2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-03-25 17:19:27 +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
Laurent Destailleur
ab4f66009a Translation 2018-03-24 00:00:35 +01:00
Laurent Destailleur
6e32e9961f Syn transifex 2018-03-23 17:56:35 +01:00
John
88fab15c60 Change situation display 2018-03-23 17:12:09 +01:00
Laurent Destailleur
a15abb2ded Update lang 2018-03-23 16:17:28 +01:00
Laurent Destailleur
c12469860a Update lang 2018-03-23 16:17:10 +01:00
Laurent Destailleur
7363ae17ee Move setup of email for module module into email templates 2018-03-23 16:09:46 +01:00
Laurent Destailleur
9980a5fbd0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2018-03-22 14:08:43 +01:00
Laurent Destailleur
99d88b0fa9
Merge pull request #8435 from enstentechnologies/7.0 
FIX PropalStatusValidatedShort missing in langs/en_US/propal.lang
 2018-03-22 14:04:40 +01:00
Laurent Destailleur
0bb7d4d494
Update propal.lang 2018-03-22 14:04:33 +01:00
vabeltran
3793fd69e6 FIX PropalStatusValidatedShort missing in langs/en_US/propal.lang 
Added PropalStatusValidatedShort value, missing in lang/en_US/propal.lang file.
 2018-03-22 13:18:06 +01:00
Laurent Destailleur
658b145ff4 Missing translation 2018-03-22 13:16:38 +01:00
Laurent Destailleur
68a4058387 Fix translation 2018-03-22 13:03:12 +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
florian HENRY
e2e1fae5e6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-03-21 22:58:33 +01:00
Laurent Destailleur
35938b1942 NEW Variable __ONLINE_PAYMENT_URL__ available in email templates 2018-03-21 20:06:22 +01:00