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

7049 Commits

Author SHA1 Message Date
Laurent Destailleur
2a8f23e8c5 Fix labels 2016-12-06 15:03:39 +01:00
fappels
c911f906c8 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status 2016-12-05 11:36:20 +01:00
Milamber
e4006602f3 Fix the new 'Identifiant Commun de l'Entreprise' label in L10N files for Morocco (Maroc) 
Fix issue in pdf.lib.php to add the Prof ID 5 and 6

Ref: http://www.ice.gov.ma/ICE/
 2016-12-05 08:04:34 +00:00
Laurent Destailleur
4b831537e5 Fix several problem in notes management of template invoices. 2016-12-04 21:27:08 +01:00
Laurent Destailleur
788cbf9a01 Complete work on dol_banner on contracts 2016-12-04 13:30:17 +01:00
Laurent Destailleur
2b8fbf200a Complete work on the new dol_banner 2016-12-03 21:29:49 +01:00
Laurent Destailleur
81a3235cf6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/facture/list.php
 2016-12-03 16:01:18 +01:00
fappels
a7a20f45a1 Remove Only shipping and dispatch status 
Remove Only shipping and dispatch status, better to create new future
option 'Routing' for this.
 2016-12-02 11:03:21 +01:00
Laurent Destailleur
d86c3931e2 Fix translation 2016-11-30 09:09:09 +01:00
Laurent Destailleur
f267273251 Missing translation 2016-11-29 10:38:27 +01:00
Laurent Destailleur
83972b39ce Complete work on dol_banner. Fix errors due to missing columns. 2016-11-28 23:58:36 +01:00
Laurent Destailleur
4eb397557f Debug accounting module 2016-11-28 19:30:55 +01:00
Laurent Destailleur
b2ed3f3053 Fix translation 2016-11-28 16:32:14 +01:00
Laurent Destailleur
5e5ce0043e Debug module ECM. 2016-11-28 12:03:33 +01:00
Laurent Destailleur
017b18d5c6 Fix #6037 #6041 2016-11-27 16:09:16 +01:00
Laurent Destailleur
2c9edd4205 Maxi debug on list. Fix responsive design. 2016-11-27 13:49:46 +01:00
Laurent Destailleur
a8c3ce4e55 FIX A form should not be inside a table. Create javascript troubles. 2016-11-26 12:21:50 +01:00
Laurent Destailleur
16ce156631 Fix responsive design 2016-11-25 18:32:52 +01:00
Laurent Destailleur
dea2ab06f5 Fix missing translation 2016-11-23 12:31:35 +01:00
Laurent Destailleur
c1628be9c0 Code comment to add some explanations 2016-11-23 12:29:42 +01:00
Laurent Destailleur
15468d88a0 FIX #6007 2016-11-22 20:36:01 +01:00
Laurent Destailleur
94607d3dea FIX #6007 2016-11-22 20:35:51 +01:00
aspangaro
638563dc5d Fix missing language key in holiday type dictionary 2016-11-22 05:54:44 +01:00
aspangaro
38a31cbd28 Fix missing key language in dictionary email models 2016-11-22 05:25:08 +01:00
IJ
b631db1d60 New: Add Hidden Options Quick Reference Link 
Add the dolibarr wiki link for quick reference from the page Setup>Other Setup
 2016-11-22 02:29:25 +00:00
aspangaro
213e7d1cd7 Fix Missing language key for dictionary format card 2016-11-21 21:49:08 +01:00
aspangaro
356b76d588 Fix missing language key 2016-11-20 22:35:26 +01:00
Laurent Destailleur
1c17335d34 FIX Move translation key in correct file 2016-11-20 18:19:39 +01:00
Laurent Destailleur
ff4fa9977c FIX #5895 2016-11-20 15:47:05 +01:00
IJ
66693c5268 Update products.lang 2016-11-19 22:42:03 +00:00
IJ
9bb60e8d2c Update agenda.lang 2016-11-19 22:41:35 +00:00
IJ
5a8b844c49 Update other.lang 2016-11-19 22:41:08 +00:00
IJ
d5fe7b8b9c Add Search Tip for User 
Add a simple tip on the search strings which could be used by the end user when they are searching from the main search box.
Tested strings are '*' and *|*
This would be very useful to the end user and new users
 2016-11-19 12:21:47 +00:00
IJ
6ebafe1a87 Add Translation String for Agenda 
Add translation string so it can be used independently for the top menu
 2016-11-19 11:32:28 +00:00
IJ
5c46095fa3 Add Translation String for Tools 
Add translation string so it can be used independently for the top menu
 2016-11-19 10:52:30 +00:00
IJ
f96fd895e3 Add Products/Services Menu Translation String 
Add the translation string into language file
 2016-11-19 10:40:45 +00:00
Laurent Destailleur
e9b78db1ac Several bug fixes: 
missing import_key field, ref generator parameter must be task not
project, import must use css, serious database integrity problem
accepting duplicate tasks.
 2016-11-19 02:16:12 +01:00
Laurent Destailleur
5816c86e07 Debug accountancy module 2016-11-17 17:51:10 +01:00
Laurent Destailleur
7197b6ce0c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-11-15 12:00:35 +01:00
Laurent Destailleur
06865b65e9 Debug accountancy module 2016-11-15 11:59:16 +01:00
Laurent Destailleur
598748b4db Merge pull request #5988 from aljawaid/develop 
Add PayPal Missing Translation String
 2016-11-14 21:49:33 +01:00
Laurent Destailleur
bfd1ce0095 Fix translation 2016-11-14 15:25:45 +01:00
Laurent Destailleur
62e0d4ec3f FIX Several problems into shipment management with lot enabled 2016-11-14 14:34:15 +01:00
Laurent Destailleur
cc70b51ba3 Fix missing warning 2016-11-14 02:25:59 +01:00
Laurent Destailleur
381b77850c Fix do not show cloning of virtual product if option is off 2016-11-14 02:08:41 +01:00
Laurent Destailleur
a369514e46 Tooltip help better 2016-11-13 20:43:34 +01:00
Maxime Kohlhaas
5f704fe5e5 Import update, new way of working with a select 2016-11-13 09:03:34 +01:00
IJ
1d2d21de09 Add PayPal Missing Translation String 
Add PayPal missing translation string to expense report payment type
 2016-11-13 00:36:24 +00:00
Laurent Destailleur
7cf4703b73 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-11-12 22:52:48 +01:00
Laurent Destailleur
63162c1bac Merge branch 'develop' of https://github.com/aljawaid/dolibarr into 
aljawaid-develop

Conflicts:
	htdocs/langs/en_US/agenda.lang
	htdocs/langs/en_US/bills.lang
 2016-11-12 22:51:31 +01:00
IJ
c2f1826ac9 Add status 2016-11-12 21:36:47 +00:00
IJ
fd63c91a18 Add Missing Translation String - Expense Report 
Add Debit/Credit Card (text) to Expense Report payment type form fields when used.
 2016-11-12 21:00:21 +00:00
Laurent Destailleur
348e004da6 Minor fixes in css 2016-11-12 16:39:08 +01:00
aspangaro
8909b4111d Add options on getNomUrl 2016-11-12 10:41:57 +01:00
Maxime Kohlhaas
d18adc1231 Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_modimport_update_option 2016-11-12 09:02:35 +01:00
Laurent Destailleur
cd9f1db229 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
 2016-11-11 15:12:30 +01:00
Laurent Destailleur
e4617ec76c Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/filemanagerdol/connectors/php/config.php
	htdocs/viewimage.php
 2016-11-11 15:03:05 +01:00
aspangaro
c65678d00a Update cactus numbering model 2016-11-11 07:36:26 +01:00
Laurent Destailleur
e4c4ced5a3 Complete work on usin dol_banner 2016-11-11 01:55:53 +01:00
Laurent Destailleur
eaa2125373 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/card.php
	htdocs/projet/class/project.class.php
	htdocs/projet/list.php
 2016-11-10 11:40:39 +01:00
Laurent Destailleur
9fd5ddf807 NEW Add REST API for projects 2016-11-09 22:54:51 +01:00
philazerty
24c12df356 Update companies.lang 
Ajout du Gabon
 2016-11-09 12:16:41 +01:00
Laurent Destailleur
c45c24f80c FIX Must use external link into a forged email content. 2016-11-08 23:18:43 +01:00
Laurent Destailleur
d1446bb7ef NEW Show subtotal into list of linked elements 2016-11-08 19:19:30 +01:00
Laurent Destailleur
6d70d39bbd NEW Add type "url" as possible extrafield. 2016-11-08 17:21:26 +01:00
Laurent Destailleur
7a94cfc994 NEW Better filtering of automatic/manually inserted events. 2016-11-08 13:03:20 +01:00
Laurent Destailleur
341e014a3d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/document.php
 2016-11-08 11:36:31 +01:00
Laurent Destailleur
5fb8ba8ee7 Better help to explain suggested account 2016-11-07 11:42:20 +01:00
Laurent Destailleur
84ed82bb08 Better error message 2016-11-07 00:20:30 +01:00
Laurent Destailleur
69a6646433 Sync transifex 2016-11-06 12:51:37 +01:00
Laurent Destailleur
55e367742a Sync transyfex 2016-11-06 12:50:32 +01:00
Maxime Kohlhaas
e5418a7624 Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_modimport_update_option 2016-11-06 11:36:08 +01:00
Laurent Destailleur
ebe3ed9ad4 Uniformize code 2016-11-04 17:48:20 +01:00
Laurent Destailleur
e59c2bb61c Debug accounting menu. Can now edit product account if already set. 2016-11-04 16:15:31 +01:00
Laurent Destailleur
6ceb79cf5a Uniformise look and feel 2016-11-03 20:55:55 +01:00
Laurent Destailleur
59291be6e0 NEW Can filter on status on objects on the "statistics" page. 2016-11-03 19:50:04 +01:00
Laurent Destailleur
6661773a06 Clean menu 2016-11-03 16:40:55 +01:00
Laurent Destailleur
3fbba59f69 Better management of status of events 2016-10-30 13:12:35 +01:00
Laurent Destailleur
03b882d095 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
 2016-10-29 19:12:58 +02:00
Laurent Destailleur
17c1b3f1d2 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2016-10-29 19:00:43 +02:00
Laurent Destailleur
78eaeab168 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-10-29 18:44:55 +02:00
Laurent Destailleur
c858c5b39b Merge pull request #5941 from simnandez/develop 
Fix bad sql query introduced by #38e6c9c
 2016-10-29 17:50:10 +02:00
Laurent Destailleur
32b6660f63 Uniformize code 2016-10-29 16:18:39 +02:00
Juanjo Menent
430312ab39 Sync transifex ready to use 2016-10-29 16:15:29 +02:00
Laurent Destailleur
5654a4609e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-28 12:00:46 +02:00
Laurent Destailleur
6938b05219 Mutualize code to show files generated for mass actions 2016-10-28 12:00:30 +02:00
Juanjo Menent
a59cf0e13b Merge pull request #5935 from aspangaro/5.0-p32 
Accountancy - Add binding and journal for expense reports
 2016-10-28 11:25:21 +02:00
aspangaro
029fa1ed8a Finishing works 2016-10-27 06:04:23 +02:00
Laurent Destailleur
54bd355800 Better help 2016-10-27 02:02:40 +02:00
Laurent Destailleur
d27ffd4194 Merge pull request #5393 from frederic34/patch-10 
NEW Add admin parameter BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDE for supplier order
 2016-10-26 11:48:02 +02:00
Laurent Destailleur
d47fc281b0 Better accountancy tutorial 2016-10-26 11:15:25 +02:00
Laurent Destailleur
75695fafa6 Merge pull request #5917 from aspangaro/5.0-p31 
Accountancy - Add menu expense report accounts in configuration
 2016-10-26 11:03:00 +02:00
Laurent Destailleur
27808b7f81 Merge pull request #5915 from aspangaro/5.0-p29 
NEW Expense report documents are now available in ECM module
 2016-10-26 10:57:23 +02:00
Laurent Destailleur
11c4f49a15 FIX #5924 2016-10-26 10:42:34 +02:00
aspangaro
8800bf8b25 Update works 2016-10-26 07:46:48 +02:00
aspangaro
883446c5bb Merge remote-tracking branch 'Upstream/develop' into 5.0-p32 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2016-10-25 22:09:40 +02:00
aspangaro
6e7f104c5f Update works 2016-10-25 07:41:01 +02:00
Laurent Destailleur
b15535c1f1 Uniformize code 2016-10-25 02:04:46 +02:00
IJ
dcd11f0c71 FIX: Missing Supplier Order Translation String 2016-10-24 23:20:24 +01:00
Sergio Sanchis Climent
2a4517e1bc FIX: #5907 2016-10-24 19:21:41 +02:00
Laurent Destailleur
f1421a2ee4 Rename constant with english name 2016-10-24 13:10:35 +02:00
Laurent Destailleur
8222f7a78b Fix translation 2016-10-24 12:24:46 +02:00
aspangaro
0d62148a0f Accountancy - Add menu expense report accounts in configuration 2016-10-24 06:27:20 +02:00
aspangaro
d0544b0aea Merge remote-tracking branch 'Upstream/develop' into 5.0-p29 2016-10-24 05:27:49 +02:00
aspangaro
337e9db046 New: Expense report documents are now available in ECM module 2016-10-24 05:26:19 +02:00
Laurent Destailleur
fdcc858008 Merge branch 'dev_resource_extrafields' of 
https://github.com/atm-florian/dolibarr into
atm-florian-dev_resource_extrafields

Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-10-24 02:05:34 +02:00
Laurent Destailleur
3c3c5d06a1 Merge branch 'NEW_parent_warehouse' of 
https://github.com/atm-gauthier/dolibarr into
atm-gauthier-NEW_parent_warehouse

Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-10-24 00:58:02 +02:00
Laurent Destailleur
0b63f89e3a Merge branch 'NEW_customerorders_to_bill' of 
https://github.com/atm-gauthier/dolibarr into
atm-gauthier-NEW_customerorders_to_bill

Conflicts:
	htdocs/langs/en_US/bills.lang
 2016-10-24 00:44:37 +02:00
Laurent Destailleur
ab3cdfa16d Clean code 2016-10-24 00:33:39 +02:00
Laurent Destailleur
60ba6164e4 Merge pull request #5883 from aspangaro/5.0-p22 
Accountancy - Add loan module in step to configure the accountancy
 2016-10-24 00:17:09 +02:00
Laurent Destailleur
534202ad45 NEW Can make reconcile directly from bank entry list 2016-10-23 23:13:03 +02:00
Laurent Destailleur
b8c9e95281 Fix translation 2016-10-22 19:14:31 +02:00
Laurent Destailleur
14e78ef50b Mutualize code of 2 lists into one page. 2016-10-22 13:52:43 +02:00
Laurent Destailleur
f0365e49e2 Fix book keeper can edit accounting account of taxes 2016-10-21 18:05:26 +02:00
Laurent Destailleur
9eafff4a97 Debug module accounting 2016-10-21 17:41:05 +02:00
Laurent Destailleur
f93bca9be9 NEW Can see/make bank conciliation from transaction list 2016-10-21 17:00:31 +02:00
Laurent Destailleur
d18097da28 Prepare database to manage different vat rate with same rate value. 2016-10-21 14:09:11 +02:00
florian HENRY
54a154fa4f NEW : Add ressource extrafields 2016-10-19 22:14:51 +02:00
Laurent Destailleur
bb6177e72f Better text 2016-10-18 12:44:27 +02:00
Laurent Destailleur
dada679110 Uniformise code 2016-10-18 12:16:12 +02:00
Laurent Destailleur
d1f9f3fd42 Better translation 2016-10-17 15:22:34 +02:00
Laurent Destailleur
28933c31dd Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/projet/card.php
 2016-10-16 19:04:33 +02:00
aspangaro
53c8649629 Merge remote-tracking branch 'Upstream/develop' into 5.0-p22 
Conflicts:
	htdocs/langs/en_US/accountancy.lang
 2016-10-16 13:44:09 +02:00
aspangaro
1af1e4dc9c Accountancy - Add loan module in step to configure the accountancy 2016-10-16 13:38:29 +02:00
Laurent Destailleur
ee1ee1eee7 Management of the "Copy of" when cloning projects. 2016-10-16 12:12:45 +02:00
aspangaro
9ab0bfe905 Fix: Add another key for bank rather than to modify one 2016-10-16 06:50:13 +02:00
Laurent Destailleur
6601c9ef1b Sync transifex 2016-10-15 16:51:02 +02:00
Laurent Destailleur
9cad437d5c Fix list in chart of account 2016-10-15 16:20:08 +02:00
Laurent Destailleur
04c0e87d79 Work on accounting module 2016-10-15 15:51:28 +02:00
Laurent Destailleur
c689248211 The setup that must be done by the bookkeeper is removed from admin 
setup and move into setup of accountancy
 2016-10-15 14:38:43 +02:00
aspangaro
49e2b1ffdb Fix: Error with language key 2016-10-15 06:56:38 +02:00
Laurent Destailleur
48ce299a38 NEW Option MAIN_INFO_SOCIETE_MAIL_ALIASES to use different identities. 2016-10-15 03:45:23 +02:00
Laurent Destailleur
dfbca2d0ad Merge pull request #5868 from olsesacl/#5830 
NEW: #5830 Allow Generic E-mail Sender
 2016-10-15 02:43:19 +02:00
Laurent Destailleur
5e00fb8fc7 Fix sepa mandate translation 2016-10-14 17:56:22 +02:00
Laurent Destailleur
a54a610a05 Uniformize code 2016-10-14 17:44:41 +02:00
Laurent Destailleur
a7c6ecc177 Fix better compatibility with multicompany 2016-10-14 16:05:25 +02:00
Laurent Destailleur
e74718827f Debug accountancy module 2016-10-14 15:44:33 +02:00
Laurent Destailleur
79d376ee12 Debug accountancy module 2016-10-14 13:05:01 +02:00
gauthier
012be8e400 NEW : security check to avoid adding a parent warehouse chich is already a child of current one 2016-10-14 12:42:42 +02:00
gauthier
416311a7b9 NEW : allow to save a parent warehouse 
# Conflicts:
#	htdocs/product/stock/card.php
 2016-10-14 11:29:14 +02:00
Laurent Destailleur
7c1b74133a Debug accountancy module 2016-10-13 22:29:49 +02:00
Laurent Destailleur
78e8ab64aa Debug multicurrency 2016-10-13 21:17:46 +02:00
Sergio Sanchis Climent
8556dab68e NEW: #5830 2016-10-13 16:44:17 +02:00
aspangaro
0b08db16a1 Fix: Missing language key 2016-10-13 06:31:09 +02:00
Laurent Destailleur
fbd57eb248 Fix missing %s 2016-10-11 15:30:57 +02:00
Laurent Destailleur
6b198e06b5 Fix english 2016-10-11 15:24:10 +02:00
Laurent Destailleur
92423be43d Fix english 2016-10-11 15:03:56 +02:00
Laurent Destailleur
d0eb636051 Fix records is always singular 2016-10-11 14:50:32 +02:00
Laurent Destailleur
a5caced878 Fix translation 2016-10-11 13:48:27 +02:00
Laurent Destailleur
e7a09c07f9 Sync and clean language files 2016-10-11 10:38:38 +02:00