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

4356 Commits

Author SHA1 Message Date
Laurent Destailleur
f3e38f4b09 FIX Fatal situation if payment removed on expense report. Action 
set_unpaid was not available.
 2019-08-03 20:53:18 +02:00
atm-quentin
eca1029cd8 missing trans 2019-08-01 15:22:39 +02:00
Laurent Destailleur
d7a41c6b72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-08-01 12:54:27 +02:00
Laurent Destailleur
5eb8f05061 FIX #11584 2019-08-01 12:23:02 +02:00
Laurent Destailleur
a46bfc7a29 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2019-07-25 17:54:14 +02:00
atm-quentin
efd89588e5 fix trans 2019-07-25 12:21:28 +02:00
Laurent Destailleur
907ba62054 Sync transifex 2019-07-24 14:59:03 +02:00
atm-quentin
5a385bf1cc ADD extrafields on global search 2019-07-24 09:41:02 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +02:00
Laurent Destailleur
3cffd70ed3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/prelevement/create.php
	htdocs/core/class/commonobject.class.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/fourn/product/list.php
	htdocs/opensurvey/index.php
	htdocs/ticket/index.php
	htdocs/ticket/list.php
 2019-07-18 18:09:37 +02:00
Laurent Destailleur
b044d95acf Merge 2019-07-18 17:50:15 +02:00
Laurent Destailleur
917799914e
Merge pull request #11433 from atm-florianm/FIX_increase_stock_on_shipment_delete_when_STOCK_CALCULATE_ON_SHIPMENT_CLOSE_is_set 
FIX: stock increase on shipment deletion if STOCK_CALCULATE_ON_SHIPMENT_CLOSE is set
 2019-07-16 13:52:50 +03:00
atm-florian.m
64d1ebf59c FIX: on shipment delete confirm dialog, a new checkbox allows the user to choose if they want their stock re-incremented after the deletion. 2019-07-04 15:06:39 +02:00
atm-florian.m
3e53a06b2e minor spelling issues 2019-07-03 16:17:47 +02:00
Laurent Destailleur
6136dd6e7c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-27 13:57:08 +02:00
Laurent Destailleur
7f9b407c37 Sync transifex 2019-06-27 13:52:46 +02:00
Laurent Destailleur
84e4def180 Transifex sync 2019-06-27 13:39:54 +02:00
Laurent Destailleur
22b91f3693 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 13:28:44 +02:00
Laurent Destailleur
0f808114e5 Sync transifex 
Fix CSS for Left To Right Languages
 2019-06-22 13:18:33 +02:00
Frédéric FRANCE
a399e3f63d
Update companies.lang 2019-06-17 13:33:44 +02:00
ATM-Nicolas
d58603bd1e Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_propal_list_column 2019-05-20 09:13:37 +02:00
ATM-Nicolas
6be48e6952 NEW : Amount HT invoiced column in propal list 2019-05-20 08:59:44 +02:00
Frédéric FRANCE
aef850f6d3
zapier for dolibarr 2019-05-19 21:12:22 +02:00
Laurent Destailleur
a5b1de4f6a Fix tab that should not be visible 2019-05-09 17:52:55 +02:00
Laurent Destailleur
b8f2f957bf Sync transifex 2019-05-09 16:58:31 +02:00
ATM-Nicolas
77d3f22163 NEW : Amount invoiced column in propal list 2019-05-07 14:39:16 +02:00
Laurent Destailleur
4899d03ff8 FIX Confusion between expired and late 2019-05-02 17:15:24 +02:00
Laurent Destailleur
a3782f7060 Transifex sync 2019-04-11 16:08:50 +02:00
Christophe Battarel
d0fcece613 dont make generic translations 2019-04-05 11:34:23 +02:00
Christophe Battarel
f167ad910e camelCase and generic cloneCategories function 2019-04-05 11:30:51 +02:00
Laurent Destailleur
42fda54edf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/fichinter/list.php
	htdocs/product/stock/replenish.php
 2019-04-02 19:41:58 +02:00
Laurent Destailleur
9b77cc4db8 Translation of currency 2019-04-02 19:33:14 +02:00
Laurent Destailleur
4b378a8d4b
Merge branch 'develop' into PaiementsModes 2019-03-26 19:45:39 +01:00
David Beniamine
f4e23ea427
Merge branch 'develop' into PaiementsModes 2019-03-24 21:34:33 +01:00
David Beniamine
b554ca2b73
Merge branch 'develop' into VATGrouped 2019-03-24 21:06:29 +01:00
David Beniamine
833da30af1
Use any dolibarr enabled paiement mode 2019-03-24 21:01:42 +01:00
David Beniamine
4b61f0d606
Grouped VAT 
Add an option to group VAT by rate in receipt
 2019-03-24 20:17:41 +01:00
David Beniamine
10ab6f480d
Automatically print receipt 2019-03-22 09:28:58 +01:00
Christophe Battarel
61f9aac887 begin factorization of categories cloning 2019-03-18 14:16:41 +01:00
Christophe Battarel
7bc0260661 begin factorization of categories cloning 2019-03-18 14:15:55 +01:00
Laurent Destailleur
8f65ee2296
Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode 2019-03-14 17:48:44 +01:00
Laurent Destailleur
7e31e6b4f6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/notify.class.php
 2019-03-13 19:30:25 +01:00
Laurent Destailleur
c2063c5d0b Fix bad translation 2019-03-12 18:24:55 +01:00
Christophe Battarel
3215e066e4 copy linked categories when cloning a product 2019-03-11 10:00:44 +01:00
atm-quentin
f51b89def3 NEW supplier buyprice barcode 2019-02-27 09:22:34 +01:00
Laurent Destailleur
3a2a1b4a56 Debug module ticket 2019-02-26 13:43:09 +01:00
ptibogxiv
091d2b9d68
FIX lang 2019-02-19 12:55:48 +01:00
Laurent Destailleur
9e28db4202 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/export.php
 2019-02-06 00:51:10 +01:00
Laurent Destailleur
7436a3bc73 Typo 2019-02-05 19:37:58 +01:00
Laurent Destailleur
66998c4873 Fix translation 2019-02-05 19:37:22 +01:00
Laurent Destailleur
eb3621839a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/members.lang
	htdocs/langs/fr_FR/members.lang
 2019-02-01 15:14:19 +01:00
Laurent Destailleur
0a56069f67 Fix trans 2019-01-31 19:42:55 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Laurent Destailleur
f9686c47af Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/website/index.php
 2019-01-23 19:22:42 +01:00
Laurent Destailleur
eefa57bf6b Sync transifex 2019-01-22 18:15:47 +01:00
Laurent Destailleur
5c2b9e3078 NEW Introduce PhpSpreadsheet for export (need php5.6+) 2019-01-21 14:06:01 +01:00
ptibogxiv
796b19bc1b
Update members.lang 2019-01-17 22:40:34 +01:00
Laurent Destailleur
ab5aaa6b43 Start debug compta-files 2019-01-17 00:32:43 +01:00
Laurent Destailleur
126e02798a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
	htdocs/langs/fr_FR/cashdesk.lang
 2019-01-07 19:49:15 +01:00
Laurent Destailleur
1188540b41 Sync transifex 2019-01-07 19:39:41 +01:00
andreubisquerra
8dee9de8f5 Add header and footer to TakePOS receipt 2018-12-30 22:20:55 +01:00
Laurent Destailleur
3d509910dd
Merge branch 'develop' into master 2018-12-22 18:24:23 +01:00
Laurent Destailleur
afee39ea68 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-21 12:09:27 +01:00
Laurent Destailleur
4859d944d8 Sync transifex 2018-12-21 12:09:03 +01:00
andreubisquerra
c4be1b141d Temporary ticket improvement in TakePOS 2018-12-19 22:52:16 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Laurent Destailleur
ec3465e65f
Merge pull request #9995 from delcroip/develop 
Add a link for compta-files.php in the accountancy leftmenue
 2018-12-15 12:09:42 +01:00
Laurent Destailleur
0c3165a79a
Merge branch 'develop' into email-contact-card 2018-12-14 15:26:15 +01:00
Laurent Destailleur
9e83699193
Merge branch 'develop' into new_branch_31_10_2018 2018-12-14 14:27:35 +01:00
Laurent Destailleur
275eeca135 Trans 2018-12-04 13:09:58 +01:00
andreubisquerra
1009588592 TakeBOX now is 'TakePOS Connector' 2018-12-01 17:09:21 +01:00
Laurent Destailleur
0b6aaccfcc sync transifex 2018-11-27 16:35:47 +01:00
Laurent Destailleur
e95c6091c4 Fix lang 2018-11-27 11:10:39 +01:00
Laurent Destailleur
0367795488 Fix auto jump on record if only 1 record in a search 2018-11-27 11:09:47 +01:00
Laurent Destailleur
7c22504252 Fix position of field must be ssame between create/edit/view 2018-11-27 09:22:59 +01:00
Laurent Destailleur
a3398f1a8d Sync transifex 2018-11-19 15:49:58 +01:00
Laurent Destailleur
13d00b2eb1 Sync transifex 2018-11-17 23:14:12 +01:00
Laurent Destailleur
f32706259a Sync transifex 2018-11-16 14:13:00 +01:00
patrick Delcroix
e9d3db084a new: link to the compta-files.php in the accountancy left menu 2018-11-10 15:35:56 +01:00
François J
f9a8b240ac Add PredefinedMailContentContact lang string 2018-11-06 15:05:03 +01:00
Laurent Destailleur
67fbb3dbb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/notify.class.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-11-03 19:15:52 +01:00
Laurent Destailleur
c9ef298839 Fix setup template emails 2018-10-31 11:38:04 +01:00
Philippe GRAND
fe6b185bf1 Typo 2018-10-31 10:32:40 +01:00
atm-quentin
96d0bb8f2e FIX adapt develop 2018-10-23 14:31:58 +02:00
atm-quentin
8442b405b2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception 2018-10-23 10:27:46 +02:00
atm-quentin
0a033f4cfd FIX : manage error 2018-10-22 16:49:36 +02:00
root
0c61162698 fix langs workflow reception 2018-10-22 14:56:13 +02:00
atm-quentin
cfba5a5e0f fix when model mail selected 2018-10-18 17:02:20 +02:00
atm-quentin
236a61ab55 new manage correctly create bills on reception 2018-10-17 11:56:32 +02:00
atm-quentin
f11e1940fc NEW mass action list reception create bills for validated reception 2018-10-16 12:05:28 +02:00
atm-quentin
83c8a78628 NEW auto event msg 2018-10-15 17:08:28 +02:00
Laurent Destailleur
31152e10f6 Trans 2018-10-13 13:27:59 +02:00
atm-quentin
83e4d6bd13 NEW export reception 2018-10-11 15:28:28 +02:00
atm-quentin
4b23b46e48 NEW workflow set reception billed on validate supplier bill 2018-10-11 14:49:19 +02:00
atm-quentin
489ccc3c49 NEW list and fix conf 2018-10-10 12:19:57 +02:00
Laurent Destailleur
3c8b365c3e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-09 14:53:39 +02:00
Laurent Destailleur
4d959bbea7 Fix consistency of label of proposal status 2018-10-09 14:06:45 +02:00
atm-quentin
9f56540e75 NEW actions buttons done with stock movement 2018-10-09 11:33:41 +02:00
Laurent Destailleur
923b561aff FIX Option for prof id mandatory not working with custom type of company 2018-10-08 20:01:45 +02:00
atm-quentin
095d851e79 FIX affichage ligne reception 2018-10-08 12:15:17 +02:00
atm-quentin
6a8092dfae NEW entete reception card 2018-10-05 16:21:50 +02:00
atm-quentin
5fe767d7bd debut card create 2018-10-04 12:27:10 +02:00
atm-quentin
52717dbb65 NEW debut rename stock conf 2018-10-03 18:05:22 +02:00
atm-quentin
41d8cb87a3 debut reception setup page 2018-10-03 12:22:41 +02:00
atm-quentin
baed678b6e NEW shipping set draft and update line 2018-10-02 15:49:31 +02:00
Laurent Destailleur
aaa5efc77e Clean Take pos module 2018-09-28 22:06:04 +02:00
Laurent Destailleur
26d20d0b76
Merge pull request #8729 from atm-quentin/NEW_rights_ignoring_min_price 
NEW Advanced permission to ignore price min
 2018-09-27 09:57:49 +02:00
Laurent Destailleur
014da6c22c Fix translation 2018-09-18 18:11:07 +02:00
Laurent Destailleur
1e36aba35f Trans 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2018-09-17 16:42:44 +02:00
Laurent Destailleur
77d7c97750 Fix typo 2018-09-12 17:18:27 +02:00
Laurent Destailleur
e3339f5f95 Fix trad 2018-09-05 19:01:00 +02:00
Laurent Destailleur
bc31fa7fbf Fix translation 2018-08-28 18:18:04 +02:00
Laurent Destailleur
bbc6255925 Fix missing language 2018-08-28 13:07:48 +02:00
Laurent Destailleur
37e16b5ff2 Trans 2018-07-16 11:55:59 +02:00
Laurent Destailleur
bd1e430a28 Synch transifex 2018-07-09 20:15:14 +02:00
Laurent Destailleur
7bf33b1bac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/hrm/index.php
	htdocs/install/mysql/tables/llx_website_account.key.sql
	htdocs/modulebuilder/template/myobject_card.php
 2018-07-02 12:16:51 +02:00
Laurent Destailleur
af21222c30 Fix translation 2018-07-02 11:47:04 +02:00
Laurent Destailleur
5c93fa1bfb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/journals_list.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/fr_FR/other.lang
 2018-06-26 01:25:03 +02:00
Laurent Destailleur
52eddbf809 Sync transifex 2018-06-26 00:29:50 +02:00
Laurent Destailleur
5829014218
Merge branch 'develop' into NEW_advance_targer_filter_everywhere 2018-06-24 10:24:26 +02:00
atm-quentin
d8ebb5da8d FIX trans 2018-06-22 11:02:20 +02:00
Laurent Destailleur
ab5ed6a3b5 Fix rename of ticket language file 2018-06-11 09:31:31 +02:00
Laurent Destailleur
74890ce656 Sync transifex 2018-06-06 12:02:33 +02:00
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00
Laurent Destailleur
05c2f206ff Fix missing lang 2018-05-21 19:35:12 +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
atm-quentin
f70df3490f FIX add db commit 2018-05-03 10:53:24 +02:00
atm-quentin
ec5e84075e NEW Rights to ignore price min 2018-05-03 10:18:38 +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
eb3b351e83 Transifex sync 2018-04-17 16:17:07 +02:00
atm-quentin
ba5ac47602 NEW OnSearchAndListGoOnCustomerOrSupplierCard conf 2018-04-13 15:48:58 +02:00
Laurent Destailleur
b652c53379 Sync transifex 2018-04-11 13:26:23 +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
Laurent Destailleur
460344fbfb Traduction 2018-03-27 16:02:06 +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
ab4f66009a Translation 2018-03-24 00:00:35 +01:00
Laurent Destailleur
6e32e9961f Syn transifex 2018-03-23 17:56:35 +01:00
Laurent Destailleur
67483eeb64 NEW Report a list of leave requests for a month 2018-03-20 13:42:29 +01:00
Laurent Destailleur
9997a6c787 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-03-16 12:20:42 +01:00
Laurent Destailleur
a94017ba25 FIX letter for month March 2018-03-16 00:07:00 +01:00
Laurent Destailleur
60283a8205 Remove file incoterm.lang 2018-03-13 18:07:58 +01:00
Frédéric FRANCE
27bf5419d6
Merge branch 'develop' into swifmailer 2018-03-09 22:44:57 +01:00
Laurent Destailleur
cf45f78d7e
Merge pull request #8218 from OPEN-DSI/product_supplier_buyprice_multicurrency 
NEW Add multicurrency support for product buy price for supplier propales, orders and invoices
 2018-03-07 13:12:23 +01:00
Laurent Destailleur
fab007ad83 Remove deprecated option dolibarr_pdf_force_fpdf 
Fix view of dolibarr setup config file
 2018-03-07 09:41:27 +01:00
Laurent Destailleur
72af963ed5 Fix triggers 2018-03-06 12:26:26 +01:00
Laurent Destailleur
a086bd0137 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/class/utils.class.php
 2018-03-06 09:20:45 +01:00
Laurent Destailleur
a765dba570 Fix trad 2018-03-06 09:06:49 +01:00
KHELIFA
54dba24ab5 Add multicurrency support for product buy price for supplier propales, orders and invoices 2018-02-23 11:06:07 +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
0fc302fe98 Sync transifex 2018-02-15 00:06:43 +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
9a4de796e1
Merge pull request #8048 from ATM-Nicolas/add_margin_filters 
NEW : Add margin filters
 2018-02-08 15:15:30 +01:00
Laurent Destailleur
180f9918c7 Transifex sync 2018-02-05 20:43:50 +01:00
Frédéric FRANCE
0568461a7b
swiftmailer 2018-01-25 22:03:51 +01:00
atm-quentin
ce29331c05 NEW Filter export model by user 2018-01-18 12:34:22 +01:00
Laurent Destailleur
133e87fcc3 Sync transifex 2018-01-14 12:45:26 +01:00
ATM-Nicolas
30c6891b95 NEW : Add product categories filter on product margin 2018-01-10 11:17:23 +01:00
Laurent Destailleur
534cbcb941 Debug translation 2018-01-03 20:59:35 +01:00
Laurent Destailleur
6676178435 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/list.php
	htdocs/contrat/card.php
 2017-12-28 09:56:40 +01:00
Laurent Destailleur
6a96a9765f Transifex sync 2017-12-21 15:04:04 +01:00
arnaud
b1ce3fc5c8 FIX stats trad for customerinvoice 2017-12-21 12:12:50 +01:00
Laurent Destailleur
9880ef7364 Fix module website 2017-12-12 01:40:34 +01:00
Laurent Destailleur
57c7fa6ae9 Sync transifex 2017-12-10 01:17:32 +01:00
Laurent Destailleur
5d7214c4e8 Sync transifex 2017-12-02 15:20:59 +01:00
Laurent Destailleur
9dcec5d6cf Sync transifex 2017-11-28 12:32:23 +01:00
Laurent Destailleur
69725fe62f Fix setup of direct print with google docs driver 2017-11-27 13:55:27 +01:00
Laurent Destailleur
6953420ce8 Support for ar_EG as laternative of ar_AS 2017-11-19 21:25:21 +01:00
Laurent Destailleur
e4b91ceb38 Add ar_EG 2017-11-19 20:33:06 +01:00
Laurent Destailleur
9f2e9ce6ef Shorter translation 2017-11-07 19:38:31 +01:00
Laurent Destailleur
219364703f Sync transifex 2017-11-01 10:48:21 +01:00
Laurent Destailleur
e41dcd173e Sync language 2017-10-19 17:55:24 +02:00
Laurent Destailleur
3a97a3e2ad Move key "Translation" into main file. 
Add direct link to edit on transifex
 2017-10-17 13:05:55 +02:00
Laurent Destailleur
a57fe329cb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-12 23:49:48 +02:00
Laurent Destailleur
e0a8f03f06 Disable prof id 4,5,6 by default 2017-10-12 23:45:53 +02:00
KHELIFA
88ab3a9cab Add a new notification for the event that has successfully closed a proposal. 2017-10-06 16:15:40 +02:00
arnaud
9795f48046 NEW comment system working with all objects 2017-09-18 17:27:29 +02:00
arnaud
ad017495f4 FIX task comment design 2017-09-13 12:09:01 +02:00
Laurent Destailleur
1f56800a50 Merge pull request #7341 from atm-arnaud/NEW_task_discussion 
New task discussion
 2017-09-11 15:20:13 +02:00
Laurent Destailleur
259cca0230 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/admin/mails_templates.php
 2017-09-08 13:30:54 +02:00
arnaud
8906c95eea NEW comments system on task 2017-09-07 16:23:51 +02:00
Neil Orley
e43b13968e New: Adds an hide hour button in the "intervention" module 
Adds a way to set the visibility of hours/mins of the intervention date field from the administration interface of the "intervention" module
 2017-09-07 15:31:19 +02:00
Neil Orley
b5c30ea679 New: Adds an hide duration button in intervention module 
Adds a way to set the visibility of the intervention time field from the administration interface of the "intervention" module
 2017-09-07 11:58:22 +02:00
Laurent Destailleur
c573df4f0e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/card.php
 2017-08-26 22:33:56 +02:00
Laurent Destailleur
b3f77ed9f7 Merge pull request #7276 from atm-john/new_develop_extrafields_facture_rec 
NEW extrafield on facture_rec
 2017-08-26 19:26:09 +02:00
Laurent Destailleur
55c4ef7ffc Merge pull request #7227 from Darkjeff/dev-report 
Dev report from bookkeeping
 2017-08-26 19:20:57 +02:00
Laurent Destailleur
7d9a18a63d Fix sql error 2017-08-24 15:39:23 +02:00
John
b18104788e New extrafield on facture_rec 2017-08-22 15:22:41 +02:00
Laurent Destailleur
348a42542d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/theme/eldy/style.css.php
 2017-08-21 13:29:08 +02:00
Laurent Destailleur
e8a2680e31 Sync transifex 2017-08-21 13:26:56 +02:00
Laurent Destailleur
22a7c9bd6b Merge pull request #7220 from guerrierk/develop 
NEW|Add possibility to propose last num releve in conciliation
 2017-08-17 23:42:07 +02:00
Laurent Destailleur
fa752348c8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/various_payment/index.php
	htdocs/contact/list.php
	htdocs/langs/en_US/errors.lang
 2017-08-02 17:56:09 +02:00
Laurent Destailleur
32eb2aba43 Sync transifex 2017-08-02 15:30:46 +02:00
GUERRIER Kevin
ded6b40489 Add possibility to propose last num releve in conciliation 2017-07-29 14:21:58 +02:00
Laurent Destailleur
d07741ada1 Merge branch 'develop' into patch-rib 2017-07-21 14:58:33 +02:00
Darkjeff
dcc3febf6f add bookkkeeping in report turnover 2017-07-20 18:22:53 +02:00
cam.lafit
f0d95fcbd9 fixup! Allow RUM on creation step 2017-07-19 16:29:56 +02:00
Laurent Destailleur
e3943155f3 Sync transifex 2017-07-09 19:32:35 +02:00
Laurent Destailleur
504d376f84 Sync transifex 2017-06-19 21:34:33 +02:00
Laurent Destailleur
d1c4439a0f Merge pull request #6858 from OPEN-DSI/module_agenda_linked_object_option 
NEW Module Agenda: Add option - Show linked object into agenda view
 2017-05-19 17:23:54 +02:00
Laurent Destailleur
330b9e7038 Merge pull request #6866 from absnc/project_element_shipping 
NEW Enable shipments in Project overview tab
 2017-05-19 17:10:51 +02:00
KHELIFA
2382a0a4ee Core dictionaries: Adds the ability to change the color and position of the dictionary 'Types of agenda events' 2017-05-19 10:46:29 +02:00
absnc
7b784a1dcb Enable shipments for project overview tab 2017-05-19 17:50:10 +11:00
KHELIFA
169859b708 Module Agenda: Add option - Show linked object into agenda view 2017-05-17 17:00:45 +02:00
Guillaume
f427c8441a add translation strings for ForceMemberType 2017-04-09 22:49:48 +02: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
807eb56807 Add BHD currency 2017-03-03 13:15:20 +01:00
Laurent Destailleur
a0fb53d5b1 Merge branch 'develop' into NEW_pdf_supplier_payment 2017-02-22 14:20:47 +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
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
Andreas Pachler
ae3ace7e94 added additional payment terms often needed in Austria 2017-02-08 12:46:42 +01:00
arnaud
6d3e43ddaf NEW Report page and menu for suppliers paiements 2017-02-03 16:34:14 +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
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
Laurent Destailleur
05582e9586 Sync transifex 2017-01-23 17:31:09 +01:00
abb
10b231bd9d new:identificateurs mprofessionnels pour l'algérie 2016-12-18 19:26:30 +01:00
Laurent Destailleur
cdba7cfa1c Clean api rest 2016-12-10 19:04:56 +01:00
Laurent Destailleur
7ec4bc055a Sync transifex 2016-12-10 11:51:55 +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
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
philazerty
24c12df356 Update companies.lang 
Ajout du Gabon
 2016-11-09 12:16:41 +01:00
Laurent Destailleur
55e367742a Sync transyfex 2016-11-06 12:50:32 +01:00
Juanjo Menent
430312ab39 Sync transifex ready to use 2016-10-29 16:15:29 +02:00
Laurent Destailleur
6601c9ef1b Sync transifex 2016-10-15 16:51:02 +02:00
Laurent Destailleur
a54a610a05 Uniformize code 2016-10-14 17:44:41 +02:00
Laurent Destailleur
e7a09c07f9 Sync and clean language files 2016-10-11 10:38:38 +02:00
arnaud
c904b8030c Merge branch 'NEW_user_date_employment' of github.com:atm-arnaud/dolibarr into HEAD 
Conflicts:
	htdocs/langs/en_US/users.lang
 2016-09-27 15:25:29 +02:00
arnaud
b717d530cd NEW User date of employment added 2016-09-27 15:16:16 +02:00
Raphaël Doursenaud
49cb61b530
CLOSE #5627 Allowed external logging modules. 
Removed Sentry logging.
 2016-08-16 03:24:04 +02:00
Laurent Destailleur
63562beb36 Fix move translation key into source language 2016-08-05 01:19:20 +02:00
Laurent Destailleur
7a7e7b330f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-04 11:58:11 +02:00
Laurent Destailleur
7f6e2a277a NEW Link between objects can be done on both side and on all objects 2016-08-04 11:57:37 +02:00
Laurent Destailleur
8b3136cb96 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/companies.lang
 2016-07-27 19:04:55 +02:00
Laurent Destailleur
f0fa9205a2 Sync transifex 2016-07-26 09:56:20 +02:00
Laurent Destailleur
9ba1ca5acb Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14 
Conflicts:
	htdocs/langs/en_US/companies.lang
 2016-07-15 17:05:12 +02:00
Laurent Destailleur
2af7a8c584 Transifex sync 2016-07-07 10:06:35 +02:00
Laurent Destailleur
63ad970a27 Sync transifex 2016-07-07 04:26:22 +02:00
Laurent Destailleur
f756f3db0e Fix hook context 'all' 2016-07-07 01:23:20 +02:00
Laurent Destailleur
2223d283dc Sync transifex 2016-06-20 00:45:25 +02:00
Laurent Destailleur
33dc2d5ec3 Sync lang 2016-06-17 19:29:58 +02:00
abb
23c0a0a64e conflict solved Merge branch 'develop' into abb-14 
Conflicts:
	htdocs/langs/en_US/companies.lang
 2016-05-02 01:28:46 +01:00
Laurent Destailleur
0cde6ad98f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2016-04-29 20:43:42 +02:00
Laurent Destailleur
0ed998af03 Revert "Revert "FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN"" 2016-04-29 19:01:38 +02:00
Laurent Destailleur
3a74946210 Revert "FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN" 2016-04-29 18:59:54 +02:00
Marcos García de La Fuente
867649e922 FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN 
Close #4813
 2016-04-23 13:36:12 +02:00
Sebastien Bechet
82f74ceb38 Postgresql compatibility patch + cosmetic 2016-03-22 10:09:41 +01:00
Laurent Destailleur
44dc07a61b Merge pull request #4807 from bafbes/abb-13 
added handle to trigger FICHINTER_ADD_CONTACT in notify module
 2016-03-18 02:40:27 +01:00
Laurent Destailleur
c20124e369 Merge pull request #4829 from jtisseau/starttls 
NEW Sending email can also use the STARTTLS protocol.
 2016-03-18 00:48:13 +01:00
Laurent Destailleur
7692c39879 Merge pull request #4614 from bafbes/abb-3 
include expense reports in linked objects section and provide template for them in this section
 2016-03-18 00:26:24 +01:00
jtisseau
969893a5b1 Adds multilanguage translations for MAIN_MAIL_EMAIL_STARTTLS 
Adds the translations for all languages having the MAIN_MAIL_EMAIL_TLS
const defined. It's just a copy of this last one changing the "(SSL)" by
"(STARTTLS)".
 2016-03-16 02:23:06 +01:00
abb
b6e39960b4 new:handle user notification in notification module 
Conflicts:
	htdocs/core/lib/usergroups.lib.php
 2016-03-13 20:08:27 +01:00
abb
d35f728fad added handle to trigger FICHINTER_ADD_CONTACT in notify module 2016-03-13 19:58:39 +01:00
Laurent Destailleur
2e1a63a1f3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/langs/de_DE/companies.lang
	htdocs/langs/fr_FR/compta.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/commerciaux.php
	htdocs/societe/consumption.php
 2016-03-10 15:09:30 +01:00
Laurent Destailleur
a61882d847 Sync transifex 2016-03-10 12:44:05 +01:00
Laurent Destailleur
09a29322c3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/orderstoinvoice.php
	htdocs/public/demo/index.php
	htdocs/societe/commerciaux.php
 2016-03-08 17:40:21 +01:00
Laurent Destailleur
f06911a8b0 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/societe/commerciaux.php
 2016-03-04 15:39:55 +01:00
philippe grand
6851c3fdb0 fix : missing translation 2016-03-03 16:18:07 +01:00
philippe grand
4a3509d350 fix : missing translation 2016-03-03 16:09:19 +01:00
philippe grand
9e80a37947 fix : missing translation 2016-03-03 15:45:42 +01:00
Laurent Destailleur
fd2166ed11 Minor enhancement on new recurring invoice generation 2016-03-03 10:42:49 +01:00
Laurent Destailleur
3a58613e45 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/projet/activity/index.php
 2016-03-02 23:40:11 +01:00
Juanjo Menent
7691e8c018 FIX : Improve and add missing translations 
As is not the branch develop, instead of transifex, we use GIT
 2016-02-26 22:17:22 +01:00
Laurent Destailleur
371dec8503 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
	htdocs/langs/en_US/products.lang
	htdocs/langs/fr_FR/companies.lang
 2016-02-24 12:13:12 +01:00
Laurent Destailleur
5d1241be2f Sync transifex 2016-02-24 12:10:25 +01:00
Laurent Destailleur
3c2b50c6a2 Include PR 2016-02-21 19:14:18 +01:00
Laurent Destailleur
4754ba5683 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/install/mysql/data/llx_10_c_regions.sql
	htdocs/install/mysql/data/llx_20_c_departements.sql
	htdocs/install/mysql/data/llx_c_forme_juridique.sql
	htdocs/langs/de_DE/companies.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/companies.lang
	htdocs/langs/fr_FR/compta.lang
 2016-02-19 20:17:51 +01:00
Laurent Destailleur
0faebc25ba Update translations 2016-02-19 19:33:31 +01:00
Laurent Destailleur
71a12824c9 Merge branch 'new_numbering_module_supplier_payment' of 
https://github.com/atm-ph/dolibarr into
atm-ph-new_numbering_module_supplier_payment

Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-15 00:31:33 +01:00
abb
4dce09cd27 include expense reports in linked objects section and provide template for them in this section 
Conflicts:
	htdocs/core/class/html.form.class.php
 2016-02-13 00:37:38 +01:00
Laurent Destailleur
5ea9c6dd83 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.formprojet.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/accountancy.lang
 2016-02-09 14:40:25 +01:00
phf
d66bc6f1b3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_numbering_module_supplier_payment 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2016-02-06 12:57:30 +01:00
Laurent Destailleur
fd7a05490d DiscountOffered text was too long 2016-02-05 20:06:07 +01:00
abcnet-lu
1e9ea4f2ac [#4568] Add professional IDs for Luxembourg 2016-02-04 16:40:49 +01:00
Laurent Destailleur
82cc0b409c Merge pull request #4546 from bafbes/bra 
provide link section in expense reports and add option for intervention
 2016-02-02 16:17:25 +01:00
abb
773ee5c0ea provide link section in expenses and add option for intervention 2016-01-31 19:59:47 +01:00
Laurent Destailleur
e3a4124a58 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/fr_FR/bills.lang
 2016-01-30 16:13:06 +01:00
Laurent Destailleur
b162eb1bb0 Update translation for 3.9 2016-01-29 00:40:15 +01:00
Laurent Destailleur
a6416b8797 Merge remote-tracking branch 'origin/3.9' into develop 2016-01-14 15:00:59 +01:00
Laurent Destailleur
0951042dad Fix: no need of translation tab if multilang was disabled. 2016-01-14 15:00:31 +01:00
phf
d213fbae08 FIX invoice situation 2016-01-13 13:42:58 +01:00
Benlo
4aef3d29c1 FIX 4347 : Add labels in translations and change order 2016-01-08 15:03:46 +01:00
Laurent Destailleur
41516093bb Syn transifex 2015-12-28 12:21:24 +01:00
Laurent Destailleur
dc9c5ed5ef Enhance transifex sync 2015-12-18 18:25:09 +01:00
Laurent Destailleur
e6ebc9c293 More complete tooltip help 2015-12-04 12:24:36 +01:00
Bahfir Abbes
7841c97387 Update products.lang 2015-12-02 19:34:02 +01:00
Laurent Destailleur
5df193ec93 Uniformize code 2015-11-28 20:25:50 +01:00
philippe grand
f4c8b5e7f8 missing translation 2015-11-22 10:46:17 +01:00
philippe grand
210c6c67cd better translation and missing translation 2015-11-22 10:40:04 +01:00
philippe grand
0408e309f8 fix : Typo and translation 2015-11-21 19:13:34 +01:00
Laurent Destailleur
dfc01e971f Update files for transifex sync 2015-11-15 20:27:43 +01:00
Laurent Destailleur
6bd6be0912 Debug and rename experimental module "supplier proposal". Still work to 
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
 2015-11-15 19:23:39 +01:00
Alexis Algoud
8221817087 NEW add an option to use standard ISO location for bill in crabe model 
For electronic sending solutions, it could be required
 2015-11-05 16:17:09 +01:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Laurent Destailleur
72cabe2fc3 More complete description of margin rules calculation 2015-10-06 19:27:48 +02:00
Laurent Destailleur
68d4a9fc63 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/societe/list.php
 2015-10-04 20:57:00 +02:00
Laurent Destailleur
c20296f963 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-10-04 20:46:17 +02:00
Laurent Destailleur
c0c0cc2415 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/interventions.lang
	htdocs/theme/md_exp/style.css.php
 2015-10-03 14:28:31 +02:00
Laurent Destailleur
4201e8b032 FIX #3630 - Wrong balance report when module salaries and donation 
disabled
 2015-10-01 14:38:31 +02:00
Laurent Destailleur
d59f62cd75 Sync transifex 2015-09-30 01:25:35 +02:00
Laurent Destailleur
9cbd236c8c Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2015-09-16 22:09:21 +02:00
Laurent Destailleur
b4c964760d Sync transifex 2015-09-13 23:25:55 +02:00
Laurent Destailleur
309e1604e1 Fix migration missing for leave request module 
Fix permission label for expense report and leave request
 2015-09-12 11:35:49 +02:00
Laurent Destailleur
4b97fae28f Fix migration missing for leave request module 
Fix permission label for expense report and leave request
 2015-09-11 07:52:06 +02:00
Laurent Destailleur
1b9b0082ba Merge pull request #3387 from defrance/patch-75 
NEW: add intervention Aera
 2015-09-05 11:19:37 +02:00
Laurent Destailleur
d108881690 Merge pull request #3370 from atm-gauthier/new_add_next_ref_on_product_service_clone 
NEW : conf to use next product/service ref when we clone a product/se…
 2015-09-05 10:57:11 +02:00
Laurent Destailleur
2a85fb542a Fix phpcs 
Sync transifex
 2015-08-31 17:22:36 +02:00
Laurent Destailleur
39cbd7629f Fix error message during import 2015-08-27 23:49:25 +02:00
BENKE Charlie
82729744b5 add translation for intervention area 2015-08-15 21:24:30 +02:00
Juanjo Menent
28a1612b8d Merge remote-tracking branch 'origin/3.8' into develop 2015-08-07 18:05:09 +02:00
Juanjo Menent
0d1b4e6911 Update fr_FR and es_ES printing message. Transifex works only for develop branch... 2015-08-07 17:09:36 +02:00
Laurent Destailleur
4567f56980 Sync from transifex 2015-07-30 17:09:18 +02:00
Gauthier
900c287de4 NEW : conf to use next product/service ref when we clone a product/service 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/product/admin/product.php
 2015-07-21 12:43:12 +02:00
Laurent Destailleur
99c8a9211e Sync with transifex 2015-07-20 13:55:43 +02:00
Laurent Destailleur
2f2b0df6f8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contact/exportimport.php
	htdocs/contact/info.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/core/tpl/document_actions_pre_headers.tpl.php
	htdocs/langs/fr_FR/categories.lang
	htdocs/main.inc.php
	htdocs/product/reassort.php
	htdocs/projet/list.php
	htdocs/societe/info.php
 2015-07-19 12:26:31 +02:00
Laurent Destailleur
db67ab0b5e Fix wrap into lang list. 
Sync with transifex
 2015-07-15 16:27:01 +02:00
phf
bde4503abd FIX : translation for 1 word do not work if product/service module are disabled because the translation search in products.lang 2015-07-15 14:46:29 +02:00
Laurent Destailleur
e31af7f914 Can filter list of setup constant on name and extend visibility to all. 2015-07-12 18:05:56 +02:00
Laurent Destailleur
f06b66c5f0 Sync from transifex 2015-07-03 15:31:51 +02:00
Laurent Destailleur
b6efa5ed11 NEW Can upload files on leave requests. Use more standard permissions. 2015-06-27 11:45:23 +02:00
Juanjo Menent
ba97763ac4 Transifex Syncro 2015-06-26 17:40:47 +02:00
maxime peyrot
f99a127a57 NEW : Enter amount for withdraws requests 2015-06-19 13:45:14 +02:00
Laurent Destailleur
d3549cc2a0 Merge branch 'add_clone_on_event_agenda' of 
https://github.com/atm-gauthier/dolibarr into
atm-gauthier-add_clone_on_event_agenda

Conflicts:
	htdocs/langs/en_US/agenda.lang
 2015-06-16 11:41:45 +02:00
Gauthier
053cfac262 NEW : clone action on agenda events 2015-06-08 12:39:25 +02:00
Laurent Destailleur
01aad8516d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/adherents/list.php
	htdocs/compta/dons/card.php
	htdocs/compta/dons/class/don.class.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/security.lib.php
	htdocs/main.inc.php
	htdocs/product/stock/massstockmove.php
	htdocs/public/test/test_arrays.php
	htdocs/public/test/test_forms.php
	htdocs/societe/societe.php
 2015-05-31 03:30:38 +02:00
Laurent Destailleur
3cfe4dc86e Sync language files 2015-05-31 03:07:17 +02:00
Laurent Destailleur
a93ba86ce0 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/core/modules/modContrat.class.php
	htdocs/expedition/class/expedition.class.php
 2015-05-07 13:35:09 +02:00
Laurent Destailleur
9b55bedf66 FIX bad calculation for stock value 2015-05-04 22:04:58 +02:00
Laurent Destailleur
4f4ebfaed3 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/printipp/admin/printipp.php
 2015-05-04 12:09:39 +02:00
Laurent Destailleur
f0b10c14d7 NEW Add a new component to select categories/tags from the main edit 
page of product. The dedicated tab is also removed.
 2015-05-03 15:51:55 +02:00
Laurent Destailleur
984aca28c3 Sync translation 2015-05-03 15:37:15 +02:00
Laurent Destailleur
100fa1067e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
 2015-04-22 17:57:57 +02:00
Laurent Destailleur
3d609d5fd0 Sync transifex 2015-04-22 14:58:06 +02:00
Laurent Destailleur
275724e7d6 Merge remote-tracking branch 'origin/3.7' into develop 2015-04-08 21:36:30 +02:00
Laurent Destailleur
ddde869ca4 Sync transifex 2015-04-08 21:35:27 +02:00
Laurent Destailleur
cf0f458a51 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/en_GB/bills.lang
	htdocs/langs/en_GB/main.lang
	htdocs/langs/en_GB/orders.lang
	htdocs/langs/es_AR/bills.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/main.lang
	htdocs/langs/es_ES/bills.lang
	htdocs/langs/es_ES/projects.lang
	htdocs/langs/fa_IR/categories.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/other.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/lv_LV/bills.lang
	htdocs/langs/nb_NO/bills.lang
	htdocs/langs/pl_PL/bills.lang
	htdocs/langs/pl_PL/mails.lang
	htdocs/langs/pl_PL/projects.lang
	htdocs/langs/ro_RO/bills.lang
	htdocs/langs/ro_RO/products.lang
	htdocs/langs/ro_RO/projects.lang
	htdocs/langs/ru_RU/bills.lang
	htdocs/langs/ru_RU/projects.lang
	htdocs/langs/sl_SI/main.lang
	htdocs/langs/tr_TR/bills.lang
	htdocs/langs/tr_TR/projects.lang
	htdocs/langs/vi_VN/bills.lang
 2015-04-02 13:57:20 +02:00
Laurent Destailleur
0f51314c7e Sync from transifex 2015-04-02 13:28:20 +02:00
Laurent Destailleur
9d752c6fca Sync from transifex 2015-03-30 10:55:08 +02:00
aspangaro
414d4c6432 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-03-22 18:08:12 +01:00
Laurent Destailleur
b0b88be81f Sync transifex 2015-03-18 15:27:27 +01:00
Laurent Destailleur
6d7b340cee Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/class/dolgraph.class.php
	htdocs/langs/en_AU/main.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/other.lang
 2015-03-16 18:30:30 +01:00
Laurent Destailleur
0ef2369399 Enhance tools to make transifex sync 2015-03-14 02:37:18 +01:00
Laurent Destailleur
a8e7d90ea3 Sync transifex 2015-03-13 22:02:53 +01:00
aspangaro
11704e0807 Merge remote-tracking branch 'Upstream/develop' into develop-loan 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-05 20:24:53 +01:00
Laurent Destailleur
7b7b5090c7 Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into 
atm-ph-incoterm

Conflicts:
	htdocs/comm/propal.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-04 23:03:29 +01:00
Laurent Destailleur
96de912661 NEW: Add module "Supplier commercial proposals" to requests 
quotation/price to suppliers.
Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into
atm-ph-new_ask_price

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/tpl/document_actions_post_headers.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-04 17:54:43 +01:00
aspangaro
4803a1fb89 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-02-25 06:59:27 +01:00
Laurent Destailleur
6d3834b3b9 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/index.php
	htdocs/projet/class/project.class.php
	test/phpunit/BankAccountTest.php
 2015-02-23 14:59:24 +01:00
phf
127868899d Merge branch 'develop' into incoterm 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-02-23 10:42:01 +01:00
aspangaro
63099727d0 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-02-21 15:10:35 +01:00
Laurent Destailleur
5dffe4b440 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-21 12:58:14 +01:00
Laurent Destailleur
070accd1e0 Work on new module expense report 2015-02-21 12:57:17 +01:00
Laurent Destailleur
f423386518 Sync lang 2015-02-20 20:20:12 +01:00
Laurent Destailleur
b6947dbe2c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
 2015-02-18 22:04:26 +01:00
Laurent Destailleur
685b8d722d Fix: Bad hook name 2015-02-17 16:46:37 +01:00
Laurent Destailleur
e5b401c8f2 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/langs/es_ES/agenda.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/langs/fr_FR/suppliers.lang
 2015-02-15 19:51:49 +01:00
Laurent Destailleur
448655ea45 First work on a new module for expense report matching dolibarr 
standard to replace current one.
 2015-02-14 18:39:45 +01:00
Laurent Destailleur
46b1e213b9 Sync from transifex 2015-02-13 21:26:43 +01:00
Laurent Destailleur
179cbbd187 Maxi debug and enhancement of module batch. 2015-02-11 22:54:06 +01:00
phf
792ec17993 [CORE] ajout de traductions ( #incoterm). 2015-02-09 17:56:06 +01:00
phf
c7e1528594 [CORE] initialisation de l'intégration du module incoterm au corp de dolibarr (#incoterm). 2015-02-09 15:53:19 +01:00
phf
34bc1dbc15 Merge branch 'develop' into new_ask_price 2015-02-09 09:07:50 +01:00
phf
35d41d6f7c [CORE] Ajout d'un attribut (delai_livraison_jours) à l'objet ProductFournisseur, paramétrable lors d'un ajout/modification d'un prix fournisseur et s'affiche sur une commande fournisseur avec le plus grand délai parmis la liste des produits dans la commande (#deliverytime). 2015-02-06 16:07:22 +01:00
phf
b31c77c754 [CORE] FIX : ajout d'une traduction manquante (#new_ask_price). 2015-02-06 09:50:59 +01:00
phf
bcbf29d9a5 [CORE] assainissement du code + traductions FR vers EN (#new_ask_price). 2015-02-04 15:39:57 +01:00
phf
bb1a27434f [CORE] épuration du fichier lang (#new_ask_price). 2015-02-03 17:10:17 +01:00
phf
f3b05d19c4 [CORE] ajout de trad (#new_ask_price). 2015-02-03 16:54:21 +01:00
phf
6d880d10ce [CORE] modifications sur les champs visibles et utilisés + correction de bug + ajout de traductions (#new_ask_price). 2015-02-03 15:20:17 +01:00
phf
5266542bc9 [CORE] correction bug + trad + ajout de conditions pour le fonctionnement du module (#new_ask_price). 2015-02-02 17:50:33 +01:00
phf
38551dd468 [CORE] retrait de liens ou champs inutile (#new_ask_price). 2015-02-02 16:17:07 +01:00
phf
a3c29f2e9c [CORE] Avancement du fonctionnement du module, correction bug et épuration de l'affichage (#new_ask_price). 2015-02-02 15:41:14 +01:00
phf
fedf476987 [CORE] ajout d'une traduction pour le bouton créer demande de prix sur la fiche fournisseur (#new_ask_price). 2015-02-02 10:25:27 +01:00
phf
f60ed2b153 [CORE] ajout de traductions pour le module (#new_ask_price). 2015-01-30 16:53:31 +01:00
phf
2f8ceea587 [CORE] renomage de variables pour le module + modification de traductions (#new_ask_price). 2015-01-29 12:12:22 +01:00
phf
c9e74fbcea [CORE] ajout d'une trad (#new_ask_price). 2015-01-29 10:44:03 +01:00
phf
b3b9527e32 [CORE] ajouts de traductions pour le module (#new_ask_price). 2015-01-28 17:29:14 +01:00
phf
a98ce01807 [CORE] renomage de masse + correction des noms des fichiers/fonctions par copie + ajout de clés de traductions (#new_ask_price). 2015-01-28 17:27:26 +01:00
phf
778ddf269d [CORE] maj des références de traductions (#new_ask_price). 2015-01-28 14:32:41 +01:00
phf
49fa0056c8 [CORE] Avancement des replace (#new_ask_price). 2015-01-27 17:43:07 +01:00
phf
aaacca9b13 [CORE] première partie des grosses modifications (#new_ask_price). 2015-01-27 16:53:27 +01:00
phf
60be0193b0 [CORE] Initialisation global du module askpricesupplier (#new_ask_price). 2015-01-26 17:21:35 +01:00
Florian HENRY
22c253cfc1 add extrafield type, check box from table 2015-01-18 16:02:31 +01:00
Florian HENRY
b407716175 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-18 11:57:32 +01:00
Laurent Destailleur
eeeb6de8d9 Merge pull request #2020 from GPCsolutions/situationsinvoices 
Situations invoices support
 2015-01-17 14:44:05 +01:00
Laurent Destailleur
6a081fe883 Merge pull request #2229 from frederic34/getnextvalue 
Translation error messages numbering modules
 2015-01-16 12:08:53 +01:00
Laurent Destailleur
58e4e01db7 Sync transifex 2015-01-12 18:59:46 +01:00
frederic34
173d3aaa90 Translation error messages numbering modules 2015-01-11 11:31:53 +01:00
Raphaël Doursenaud
50c2b75ef8 Invoices: added situation (or interim) invoices support 2015-01-06 17:12:13 +01:00
Laurent Destailleur
657fc1b91c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/fiche.php
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/fiche.php
	htdocs/langs/fr_FR/compta.lang
	htdocs/projet/element.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/time.php
 2014-12-26 04:44:15 +01:00
Laurent Destailleur
219cd0f855 Fixed: Translation 2014-12-20 15:52:50 +01:00
Laurent Destailleur
d2398dd1b1 Sync from transifex 2014-12-15 10:31:40 +01:00
Laurent Destailleur
5f8919c857 Update translation 2014-12-08 23:59:33 +01:00
Florian HENRY
99f817b69a - New: Add Option to not change date on cloning project 2014-12-05 21:40:55 +01:00
Laurent Destailleur
a9338a0f9f Fix: Maxi debug of module productbatch. 
Conflicts:
	htdocs/core/class/conf.class.php
	htdocs/langs/en_US/productbatch.lang
 2014-12-05 16:04:37 +01:00
Laurent Destailleur
5457d3116a Fix: Maxi debug of module productbatch. 2014-12-05 16:01:01 +01:00
Laurent Destailleur
792eba4810 Merge branch '3.7-transifex' of github.com:GPCsolutions/dolibarr into 
GPCsolutions-3.7-transifex

Conflicts:
	htdocs/langs/pt_BR/oscommerce.lang
 2014-12-03 13:28:38 +01:00
Laurent Destailleur
931c1fc671 Sync from transifex 2014-11-30 16:20:58 +01:00
Raphaël Doursenaud
10456f90d9 Language files should not be executable 2014-11-28 16:06:45 +01:00
Raphaël Doursenaud
92b54fd496 Removed deprecated oscommerce language files 
Note to transifex sync personnel: you may have to manually remove the file
from Transifex to prevent it from coming back!
 2014-11-28 16:03:45 +01:00
aspangaro
c256243bf7 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-16 08:41:39 +01:00
Laurent Destailleur
4df754f36f Merge pull request #2015 from aspangaro/develop-patch 
Update accounting language
 2014-11-15 12:19:23 +01:00
Laurent Destailleur
58c06264e4 Merge branch 'develop' of github.com:BadPixxel/dolibarr into 
BadPixxel-develop

Conflicts:
	htdocs/langs/en_US/categories.lang
	htdocs/langs/fr_FR/categories.lang
 2014-11-15 12:17:46 +01:00
aspangaro
a55afd4f50 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-12 07:32:32 +01:00
aspangaro
c268b1fb64 Update accounting language 
Problem with transifex in french, the file is in french language on the website but in github, still in english...
 2014-11-11 14:49:26 +01:00
aspangaro
3042bf4dc2 Correct lot of bugs 2014-11-10 06:08:50 +01:00
Laurent Destailleur
50f690787b Sync transifex 2014-11-09 19:16:41 +01:00
aspangaro
9c3fa5a9eb Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-09 07:26:14 +01:00
Laurent Destailleur
5094c2c066 Merge pull request #1998 from frederic34/iconstock 
Try to improve stock display for all stock increase/decrease options
 2014-11-07 21:48:04 +01:00
aspangaro
840dfd780d Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-07 21:28:39 +01:00
Christophe Battarel
44882f4035 improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option 2014-11-05 17:03:53 +01:00
Laurent Destailleur
5e0946bdc2 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/adherents/fiche.php
	htdocs/core/lib/date.lib.php
	htdocs/langs/fr_FR/bills.lang
	htdocs/resource/class/resource.class.php
 2014-11-05 16:37:07 +01:00
Laurent Destailleur
4f08408065 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	ChangeLog
	htdocs/core/class/commonobject.class.php
 2014-11-05 16:28:44 +01:00
aspangaro
cbfa90abca Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-04 20:57:05 +01:00
Laurent Destailleur
606a3f9917 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-11-04 17:54:09 +01:00
Laurent Destailleur
c41e908dba Merge pull request #2000 from Devensys/Develop-MajPasswordPattern 
New modGeneratePass with personal conf
 2014-11-04 17:37:25 +01:00
Andrelec1
796f2409a1 Add verif and correction lang 2014-11-04 11:38:16 +01:00
aspangaro
25433120e6 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-04 06:16:03 +01:00
Andrelec1
5074feacd6 Add option and create new class 2014-11-03 17:57:55 +01:00
frederic34
77f1e587e6 Some translations 2014-11-01 22:08:18 +01:00
frederic34
f23f16da86 Try to improve stock display for all stock increase/decrease options 2014-11-01 21:38:50 +01:00
Laurent Destailleur
8d964e03d2 Merge branch 'agenda-export-by-project' of github.com:AMMD/dolibarr into 
AMMD-agenda-export-by-project

Conflicts:
	htdocs/admin/agenda_xcal.php
 2014-10-30 18:19:13 +01:00
jfefe
c5045a75d8 Missing trans key into resource module 2014-10-30 01:16:37 +01:00
Laurent Destailleur
1669700148 Uniformize and clean boxes behaviour and translation. 2014-10-27 21:49:51 +01:00
Laurent Destailleur
0abeea059e Uniformize and clean boxes behaviour and translation. 2014-10-27 21:48:28 +01:00
Grégory DAVID
a794180586 Document the ability to export agenda calendar restricted to project ID 2014-10-18 16:41:47 +02:00
Laurent Destailleur
f498921715 Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into 
GPCsolutions-droposcommerce

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/vi_VN/admin.lang
	htdocs/langs/vi_VN/shop.lang
 2014-10-13 00:50:51 +02:00
Laurent Destailleur
8a98f8461d Sync transifex 2014-10-11 14:33:22 +02:00
Laurent Destailleur
a19e8aa89d Sync transifex 2014-10-09 17:15:15 +02:00
aspangaro
7fa2b6b3eb Update 2014-10-06 05:34:45 +02:00
aspangaro
c1db82a791 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-10-04 08:10:12 +02:00
Laurent Destailleur
d9f898ab8c Merge pull request #1916 from FHenry/develop 
Add feature to order to invoice on supplier part
 2014-10-04 00:31:11 +02:00
Laurent Destailleur
02512180e0 Sync from transifex 2014-10-03 19:21:45 +02:00
aspangaro
dca4591cdf Add calculator 2014-10-02 20:00:35 +02:00
aspangaro
3627f157d2 Add langs & debug 2014-10-01 07:16:29 +02:00
BadPixxel
12e6d1bf6c Missing Key for getNomUrl function 2014-09-30 19:09:59 +02:00
Laurent Destailleur
e35135d5b1 Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into 
develop

Conflicts:
	htdocs/compta/ventilation/card.php
	htdocs/compta/ventilation/fournisseur/card.php
	htdocs/compta/ventilation/fournisseur/list.php
	htdocs/compta/ventilation/list.php
	htdocs/core/menus/init_menu_auguria.sql
 2014-09-29 16:31:35 +02:00
Raphaël Doursenaud
f01e76f686 Removed unmaintaned OScommerce module 2014-09-29 15:22:48 +02:00
Florian HENRY
518d23f278 Add feature to order to invoice on supplier part 2014-09-23 16:28:29 +02:00
Laurent Destailleur
aba4c90d2b Trans 2014-09-23 11:23:57 +02:00
Laurent Destailleur
d0da5ef047 Merge pull request #1910 from FHenry/develop 
Better accountancy auto find accountancy code feature (work with several
 2014-09-22 23:48:32 +02:00
aspangaro
e147259e95 Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6 2014-09-21 20:30:55 +02:00
Florian HENRY
119be5da42 Better ressource management on project and task 2014-09-20 10:14:26 +02:00
aspangaro
ab9226aab6 Delete elements have a link with old module ventilation - Replace today by module Accounting Expert 2014-09-19 05:55:54 +02:00
Laurent Destailleur
2b69358c9c Merge pull request #1896 from FHenry/develop 
Add Dunning into accountancy report
 2014-09-18 17:48:40 +02:00