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

2609 Commits

Author SHA1 Message Date
Laurent Destailleur
213c818204 Debug serial/lot management 2015-02-16 20:14:16 +01:00
Laurent Destailleur
118ae7e8f8 Backport fix done into dev. 2015-02-16 17:55:53 +01:00
Laurent Destailleur
3ca31e34cb New: Add field "budget" (amount) on projects. 2015-02-16 10:58:05 +01:00
Laurent Destailleur
82b3f4a102 Add field budget_amount on project. 2015-02-16 10:40:09 +01:00
Laurent Destailleur
2045fb22e9 Lock 5.5.40 2015-02-15 23:39:30 +01:00
Laurent Destailleur
2e0b2fb012 Work on expensereport module 2015-02-15 22:49:23 +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
KreizIT
0c0c442248 Make MS SQL working 2015-02-14 16:27:00 +01:00
KreizIT
674585136e Fix inconsistent data 2015-02-14 16:18:18 +01:00
Laurent Destailleur
7cf115cc87 Introduce a protection to avoid migration if database has critical bugs 
making data lost.
 2015-02-14 12:26:39 +01:00
Laurent Destailleur
c596fa1475 Introduce a protection to avoid migration if database has critical bugs 
making data lost.
 2015-02-14 12:24:16 +01:00
Laurent Destailleur
6adfc6f6f4 Work on batch module. Add batch, eatby and sellby into movement table. 
Clean language files for direct print module.
 2015-02-12 15:23:31 +01:00
Gauthier
be56f76743 FIX : Display error on dispatched quantity when we have several times same product in a supplier order 2015-02-12 12:56:21 +01:00
Laurent Destailleur
179cbbd187 Maxi debug and enhancement of module batch. 2015-02-11 22:54:06 +01:00
Laurent Destailleur
fb3cf4da1e New: The comment of the stock movement when making a supplier order 
receiving is also stored into the tracking dispatch table (not only into
stock movement table).
 2015-02-11 15:03:33 +01:00
Laurent Destailleur
b9d2de99e1 Translation 2015-02-11 14:46:16 +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
67fc6de840 [CORE] local phpunit - retrait des mauvais caractères et type des colonnes (#new_ask_price). 2015-02-09 11:57:04 +01:00
phf
ffecdc13ff [CORE] déplacement de la création des tables du module dans le script de migration (#new_ask_price). 2015-02-09 10:38:48 +01:00
phf
34bc1dbc15 Merge branch 'develop' into new_ask_price 2015-02-09 09:07:50 +01:00
Laurent Destailleur
1776349a30 Merge pull request #2329 from atm-ph/deliverytime 
NEW Deliverytime
 2015-02-08 00:00:50 +01:00
Laurent Destailleur
505f194689 Merge pull request #2319 from defrance69/patch-45 
Update 3.6.0-3.7.0.sql
 2015-02-07 23:46:12 +01:00
Laurent Destailleur
ef31ca9b84 New: Add balance of each account statement. 2015-02-07 23:32:46 +01:00
phf
0e74dd4b95 [CORE] ajout de la colonne "delivery_time_days" en bdd (#deliverytime). 2015-02-06 16:35:19 +01:00
Laurent Destailleur
556c27f834 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/stock/mouvement.php
 2015-02-04 15:15:50 +01:00
BENKE Charles
79818e8693 Update 3.6.0-3.7.0.sql 
update url in llx_bank_url for remplacement of fiche.php by card.php
Need to made it on 3.7 branch urgently
 2015-02-04 00:45:52 +01:00
Laurent Destailleur
43f3d5805e Merge pull request #2301 from frederic34/patch-3 
Update 3.7.0-3.8.0.sql
 2015-02-03 12:31:06 +01:00
Juanjo Menent
b513aa5455 Adapting spanish localtax2 to 2015 fiscal reforms 2015-02-02 21:32:52 +01:00
Juanjo Menent
2389e332db Adapting spanish localtax2 to 2015 fiscal reforms 2015-02-02 21:28:27 +01:00
Juanjo Menent
2fd38f310a Increase size of localtaxX (10 is not enough in some cases) 2015-02-02 21:06:21 +01:00
Juanjo Menent
ef3dfbf3a1 Increase size of localtaxX (10 is not enough in some cases) 2015-02-02 21:04:00 +01:00
Laurent Destailleur
c19ff003ea Merge pull request #2292 from FHenry/develop_contract_line_extrafileds 
NEW: contract lines extrafileds
 2015-01-31 19:43:37 +01:00
Laurent Destailleur
963b9e8583 Merge remote-tracking branch 'origin/3.7' into develop 2015-01-31 19:37:25 +01:00
Frédéric FRANCE
8d45d3cd59 Update 3.7.0-3.8.0.sql 2015-01-31 15:51:55 +01:00
Laurent Destailleur
1c7feb67ea Merge branch 'dinamic-prices-product' of 
https://github.com/IonAgorria/dolibarr into
IonAgorria-dinamic-prices-product

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/fournisseurs.php
 2015-01-31 14:53:14 +01:00
Laurent Destailleur
720caf8e31 Missing XPF currency 2015-01-31 12:19:06 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +01:00
Laurent Destailleur
43702cf662 New: Enhance stock management: Introduce tag to define if a subproduct 
must have stock decreased and add inventory code on stock movements.
 2015-01-30 01:51:28 +01:00
phf
c5398f61f9 [CORE] Modif de trad et renomage pour le module askpricesupplier (#new_ask_price). 2015-01-28 15:37:52 +01:00
phf
d134fa6a32 [CORE] copie du odt propal pour le module askpricesupplier (#new_ask_price). 2015-01-28 15:33:52 +01:00
Florian HENRY
66c73ca336 add missing files for contract line extrafields 2015-01-27 12:57:36 +01:00
Laurent Destailleur
da9f13bca9 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-25 22:30:05 +01:00
Laurent Destailleur
57c84089fe Introduce warning to remind to do a backup before migration. 
Required because we discovered, during beta, serious bugs into some
databases system loosing data.
 2015-01-25 22:29:36 +01:00
aspangaro
ae11ab12f6 FIXED Accounting module - Align core & module 3.6 2015-01-25 06:54:17 +01:00
cla
134759ce28 update table name facture_fourn_det_extrafields 2015-01-22 15:02:19 +01:00
cla
c8480efbef update table name facture fourn det extrafields 2015-01-22 15:01:27 +01:00
cla
c953a04687 Added files for Extrafields in Order/Invoice Supplier Line. New files 
sql added in install/mysql folder and 2 new pages to insert extrafields
in admin folder
 2015-01-22 14:18:33 +01:00
Laurent Destailleur
667565f04f Fix missing table in migration script 2015-01-19 02:38:24 +01:00
Laurent Destailleur
fdaa930507 Solve phpunit. 
Fix database field format
 2015-01-19 01:58:48 +01:00
Laurent Destailleur
28148f8637 Fixed: Bad sql requests 2015-01-18 20:49:57 +01:00
Laurent Destailleur
e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php
 2015-01-18 18:44:22 +01:00
Laurent Destailleur
34fe87536b Merge pull request #2137 from frederic34/printipp 
Printing System which may accept modules
 2015-01-18 13:09:41 +01:00
Laurent Destailleur
19dbf7e2c6 Merge pull request #2185 from marcosgdf/bug-1765 
Fix: [ bug #1765 ] Unable to create a contract
 2015-01-18 12:39:25 +01:00
Laurent Destailleur
eaacb3c33b Merge pull request #2257 from IonAgorria/per-entity-smtp 
Store per entity SMTP configuration
 2015-01-18 12:33:08 +01:00
Laurent Destailleur
1681e3b03d Fix: Not allowed types 
(http://wiki.dolibarr.org/index.php/Langages_et_normes#Structure_des_tables_et_champs)
 2015-01-18 11:36:15 +01:00
Ion Agorria
48c6897f75 Store per entity SMTP configuration 2015-01-18 03:20:35 +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
30abacd0a6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-17 14:42:42 +01:00
Laurent Destailleur
87a59ef527 Merge branch 'develop_bank_extrafields' of 
https://github.com/FHenry/dolibarr into FHenry-develop_bank_extrafields

Conflicts:
	htdocs/admin/bank.php
 2015-01-17 14:42:04 +01:00
Laurent Destailleur
c54355b63a Merge remote-tracking branch 'origin/3.7' into develop 2015-01-16 10:44:41 +01:00
Laurent Destailleur
ba49cce47a Fix: The filter into event views on user must be done on assigned 
resource, not only owner.
 2015-01-15 02:06:04 +01:00
Laurent Destailleur
cd2a9d0e09 Merge remote-tracking branch 'origin/3.7' into develop 2015-01-10 01:07:55 +01:00
Laurent Destailleur
f7960ec104 Fixed: Upgrade are done several times 2015-01-09 23:19:18 +01:00
Laurent Destailleur
fc78d632d3 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
 2015-01-09 23:09:10 +01:00
Laurent Destailleur
f8792bdbc7 Fixed: Add opensurvey into list of reloaded modules for 3.7 2015-01-07 11:11:40 +01:00
Raphaël Doursenaud
50c2b75ef8 Invoices: added situation (or interim) invoices support 2015-01-06 17:12:13 +01:00
Laurent Destailleur
2bf2c8fce7 Restore all requets 2015-01-06 00:34:23 +01:00
Laurent Destailleur
033757aafd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
 2015-01-06 00:33:28 +01:00
Laurent Destailleur
a668d163fd Repair corrupted data 2015-01-06 00:27:35 +01:00
Laurent Destailleur
908a95d83f Merge pull request #2211 from marcosgdf/contract-fixes 
Several Contract-related fixes
 2015-01-06 00:18:51 +01:00
Laurent Destailleur
3794c9305e Fix: [ bug #1754 ] Error while installing 3.7 2015-01-06 00:04:23 +01:00
Marcos García de La Fuente
7424ee1107 Improving Contrat documentation and fixed some properties usage 2014-12-28 19:28:25 +01:00
Marcos García de La Fuente
98ed747671 Fix: [ bug #1765 ] Unable to create a contract 2014-12-28 17:17:08 +01:00
frederic34
e937039596 Merge remote branch 'upstream/develop' into printipp 2014-12-28 11:59:58 +01:00
Ion Agorria
5bbcb58b44 Added expressions for product/service prices 2014-12-28 01:26:41 +01:00
Laurent Destailleur
5ead994955 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-26 04:57:55 +01:00
Laurent Destailleur
0e952c67ff Merge pull request #2193 from marcosgdf/bug-1761 
Fix: [ bug #1761 ] SQL error when installing 3.7 with PostgreSQL
 2014-12-26 04:14:03 +01:00
Laurent Destailleur
420ebe0be9 Fix: Change order to create fields 2014-12-26 04:04:16 +01:00
Marcos García de La Fuente
745eece5fe Fix: [ bug #1761 ] SQL error when installing 3.7 with PostgreSQL 2014-12-26 00:34:57 +01:00
Laurent Destailleur
08fd74e79e Fix: [ bug #1687 ] The ref filter searches on ref and rowid in supplier 
invoices list
 2014-12-25 12:07:27 +01:00
Laurent Destailleur
2b4edd9996 Fix: [ bug #1687 ] The ref filter searches on ref and rowid in supplier 
invoices list
 2014-12-23 13:21:40 +01:00
frederic34
3bf63ed0a9 Merge remote branch 'upstream/develop' into printipp 2014-12-21 14:59:37 +01:00
Laurent Destailleur
4769e26d8e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-18 12:34:41 +01:00
Laurent Destailleur
6b24a9128e Merge pull request #2150 from grandpaul/taiwanvat 
Add Taiwan VAT 5%
 2014-12-16 17:09:07 +01:00
Laurent Destailleur
81437d8277 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-12-16 01:56:44 +01:00
Laurent Destailleur
174428ad31 Data init for canada vat 2014-12-16 01:55:03 +01:00
Ying-Chun Liu (PaulLiu)
71c5f81bdf Handle updates for Taiwan VAT. 
Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
 2014-12-16 00:48:35 +08:00
Laurent Destailleur
711b033844 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/stock/card.php
 2014-12-14 12:35:13 +01:00
Ying-Chun Liu (PaulLiu)
81c9d12313 Add Taiwan VAT 5% 
The most common VAT in Taiwan is 5%. This commit adds the VAT for Taiwan.

Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
 2014-12-13 21:41:29 +08:00
Laurent Destailleur
9be99b2987 Fixed: We must use PMP of product. Not warehouse. 2014-12-09 14:27:02 +01:00
frederic34
9bb1999dc2 Some correct 2014-12-08 21:07:24 +01:00
frederic34
295fe115ab Merge remote branch 'upstream/develop' into printipp 2014-12-08 20:33:50 +01:00
frederic34
be60c13de6 WIP Printing System 2014-12-08 20:33:26 +01:00
Laurent Destailleur
634a9d8402 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2014-12-07 19:19:48 +01:00
Laurent Destailleur
1db6d86c78 Fix: versions 2014-12-07 19:10:24 +01:00
Laurent Destailleur
a59ac280bc Doxygen 2014-12-07 02:19:57 +01:00
Laurent Destailleur
0459477097 Fix: Miscellaneous fixes for multicompany 2014-12-06 14:41:56 +01:00
Laurent Destailleur
f54f14ae04 Fix: W3C table with no tr 2014-12-03 17:16:38 +01:00
Laurent Destailleur
1e8e4e7fda Prepare 3.8 dev 
Fix bad test.
Renamed table for dynamic prices.
 2014-12-03 17:06:44 +01:00
Laurent Destailleur
1653384415 Merge branch 'dinamic-prices' of github.com:IonAgorria/dolibarr into IonAgorria-dinamic-prices 2014-12-03 13:14:35 +01:00
Laurent Destailleur
f884f16564 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/boxes.php
	htdocs/comm/action/card.php
	htdocs/core/class/html.formfile.class.php
 2014-12-03 12:54:42 +01:00
Laurent Destailleur
55b7bb532d Fixed: Bad field of default value for fields into predefined/recuring 
invoice tables.
 2014-12-01 23:50:03 +01:00
Laurent Destailleur
ef4bdcdb2a Merge remote-tracking branch 'origin/3.7' into develop 2014-11-30 15:43:04 +01:00
Laurent Destailleur
e395fd8096 Fix CRLF 2014-11-30 15:24:39 +01:00
Ion Agorria
0fafe3f7d2 Required SQL changes for dinamic prices 2014-11-29 06:31:54 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Laurent Destailleur
671243e8f6 Fixed: Bugs reported by scrutinizer 
Fixed: Solve conflict between ->iban and ->iban_prefix.
 2014-11-22 16:57:08 +01:00
Laurent Destailleur
31a5a46ffa Merge pull request #2022 from asirinelli/3.7 
Add EIRL in llx_c_forme_juridique
 2014-11-22 16:00:32 +01:00
Laurent Destailleur
dfae42cd4a Merge pull request #2051 from aspangaro/1690 
#1672 VAT accounts by default are lost in migration
 2014-11-22 15:41:58 +01:00
Laurent Destailleur
088dd1d2e9 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-22 15:30:37 +01:00
Laurent Destailleur
b5e64b66c8 Merge pull request #2025 from GPCsolutions/dbupgrade 
Work around tms bugs with MariaDB
 2014-11-22 15:26:42 +01:00
aspangaro
621f2b5c77 #1672 VAT accounts by default are lost in migration 2014-11-18 21:28:12 +01:00
Laurent Destailleur
8b0a9d78bb Fix: CRLF 2014-11-18 19:03:02 +01:00
Laurent Destailleur
31f987706c Fix: bugs reported by scrutinizer 2014-11-17 15:13:23 +01:00
Raphaël Doursenaud
079dbf9fbd Work around bug #1644 2014-11-17 14:59:14 +01:00
Antoine Sirinelli
ec20b38adc Add EIRL in llx_c_forme_juridique 
This a not so new French type of company: Entreprise Individuelle à
Responsabilité Limitée (EIRL).
Migration script also added.
 2014-11-16 23:56:10 +01:00
Laurent Destailleur
10117d045f Fixed #1637 2014-11-16 16:15:31 +01:00
aspangaro
c256243bf7 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-16 08:41:39 +01:00
Laurent Destailleur
11eb7de596 Try to clean sql to avoid mysql bug 2014-11-15 14:14:52 +01:00
BENKE Charles
6cee8e1294 Update 3.6.0-3.7.0.sql 
increase fieds size of ref supplier (order and bill)
 2014-11-13 11:24:45 +01:00
BENKE Charles
38c2dc8747 Update llx_facture_fourn.sql 
increase ref fields size (like customers facture)
 2014-11-13 11:16:40 +01:00
BENKE Charles
0a1f5eff41 Update llx_commande_fournisseur.sql 
extend ref fields size (like for customer commande)
 2014-11-13 11:15:24 +01:00
BENKE Charles
0131acd930 Update llx_commande_fournisseur.sql 
increase size of ref supplier (some supplier are very long ref...)
 2014-11-13 11:06:21 +01:00
aspangaro
a55afd4f50 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-12 07:32:32 +01:00
Laurent Destailleur
7177c04378 Minor css enhancement 2014-11-11 20:45:30 +01:00
Florian HENRY
e9f754395d Start bank extrafields 2014-11-10 13:09:58 +01:00
aspangaro
3042bf4dc2 Correct lot of bugs 2014-11-10 06:08:50 +01:00
aspangaro
9c3fa5a9eb Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-09 07:26:14 +01:00
Laurent Destailleur
9ae03f533d Test 2014-11-08 00:35:28 +01:00
Laurent Destailleur
7ca2e275df Track travis bug 2014-11-08 00:10:05 +01:00
aspangaro
840dfd780d Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-07 21:28:39 +01:00
Laurent Destailleur
633e34da52 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-11-06 13:47:38 +01:00
Laurent Destailleur
b68bfac593 Fix: Usage of migration scripts from command line 2014-11-06 13:46:12 +01:00
Juanjo Menent
6f9d283ddc Fix: Module notifications DB Error "unknown field type" into third tab 
notifications
 2014-11-06 11:20:47 +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
0d62556fa0 Maj doc 2014-11-05 11:01:53 +01:00
aspangaro
cbfa90abca Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-04 20:57:05 +01:00
Laurent Destailleur
504a9a92a4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-11-04 17:42:22 +01:00
Laurent Destailleur
5656773430 Update doc 2014-11-04 17:42:01 +01:00
Laurent Destailleur
e296e52531 Merge pull request #2002 from Devensys/develop-FixErrorinSQLsociete 
Develop fix errorin sq societe
 2014-11-04 17:35:39 +01:00
Laurent Destailleur
899fecb484 Some maintenance sqls 2014-11-04 16:40:01 +01:00
Andrelec1
c9c499717b Fix bad comma 2014-11-04 14:56:18 +01:00
Andrelec1
6837ff730b Fix missing comma 2014-11-04 14:41:56 +01:00
aspangaro
25433120e6 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-04 06:16:03 +01:00
Laurent Destailleur
cf6a0df3e4 A lot of fix in missing intervention trigger. Align key to use same name 
to avoid future bugs.
 2014-11-03 17:23:02 +01:00
Laurent Destailleur
155452ba91 Fix: Proposal deadlock situation 
New: Add missing trigger PROPAL_CLASSIFYBILLED.
 2014-11-03 16:20:55 +01:00
Laurent Destailleur
a1a10edc30 Merge pull request #1987 from IonAgorria/soap-client-order 
Added SOAP client for creating a client order in remote webservice
 2014-11-01 21:14:19 +01:00
Ion Agorria
82aa8458bf Added ws url/key to thirdparty SQL table, class and info page 2014-10-31 17:46:11 +01:00
Laurent Destailleur
9c51effe5c Ajout plus d'info dans description audit. 2014-10-31 15:42:35 +01:00
aspangaro
57f49ec5d4 GPLv3 2014-10-30 20:41:08 +01:00
Laurent Destailleur
fb4858a5d3 Update changelog 2014-10-30 18:07:09 +01:00
Laurent Destailleur
9d9a1e0701 Merge pull request #1974 from grandoc/develop 
encrease name length for societe
 2014-10-30 18:04:38 +01:00
Laurent Destailleur
38a939771c New: Add template of emails into dictionnary. 2014-10-30 17:16:51 +01:00
Laurent Destailleur
a1a03a8061 New: Module notification has been enhanced: 
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
 2014-10-25 01:20:59 +02:00
Philippe GRAND
19e194dd81 encrease name length for societe 2014-10-23 12:01:15 +02:00
Laurent Destailleur
0fba70d4d1 Fix: Triggers sending email for intervention and classify billed 2014-10-20 11:35:34 +02:00
Laurent Destailleur
718b3b19b4 Fix: user and date modification not updated 2014-10-20 11:16:51 +02:00
Laurent Destailleur
e53c328767 Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into 
aspangaro-develop-favorite

Conflicts:
	ChangeLog
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-10-18 15:45:44 +02:00
aspangaro
9f6a460d42 Merge remote-tracking branch 'Upstream/develop' into develop-favorite 
Resolve conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-10-18 15:32:50 +02:00
Maxime Kohlhaas
737cafef4e Merge branch 'develop' of github.com:Dolibarr/dolibarr into mkoevols 2014-10-15 15:02:36 +02:00
Regis Houssin
a1210da513 Fix: missing entity in unique index 2014-10-14 20:19:02 +02:00
Maxime Kohlhaas
452636b0e4 New : Add option to allow extrafield to be modified regardless of the document status 2014-10-14 15:27:40 +02:00
aspangaro
861583bb77 Merge remote-tracking branch 'Upstream/develop' into develop-favorite 2014-10-14 06:12:46 +02:00
Laurent Destailleur
2cf21f856c Fix: table name differs. 2014-10-14 01:47:31 +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
aspangaro
dc6817813e Merge remote-tracking branch 'Upstream/develop' into develop-favorite 2014-10-12 20:23:08 +02:00
Laurent Destailleur
3bac7c9e11 Add index on new table llx_c_email_template 2014-10-12 16:31:56 +02:00
aspangaro
71dafac03c Add favorite button into country dictionary to put value on top select list 2014-10-12 15:28:01 +02:00
Laurent Destailleur
44e2cd2194 Prepare code to manage task_datehour with task_date. 2014-10-12 01:20:03 +02:00
Laurent Destailleur
00fd9acf31 Fix: Bad length of field 
Transifex sync
 2014-10-09 18:32:23 +02:00
Laurent Destailleur
e76b5a370d Fix: bad parameter 2014-10-09 17:27:14 +02:00
Laurent Destailleur
0390085f54 Style for install match css of login. 2014-10-09 13:47:40 +02:00
aspangaro
c1db82a791 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-10-04 08:10:12 +02:00
Laurent Destailleur
e70aebf2c7 Merge pull request #1937 from fappels/develop 
Expedition lines from same orderline merged.
 2014-10-04 00:58:19 +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
Francis Appels
269df77873 Fix migration sql for inserting accounting records 
Migration SQL could not insert accounting records because datec was set
to NOT NULL
 2014-10-03 12:59:33 +02:00
Laurent Destailleur
8bc57e38d1 Uniformize, support, install and login page with a more neutral 
background (nearest bootstrap). Remove image background.
 2014-10-03 01:48:14 +02:00
aspangaro
f70e8b766f Merge remote-tracking branch 'Upstream/develop' into develop-loan 
Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-09-29 20:40:53 +02:00
aspangaro
d3252d1348 Update 2014-09-29 20:37:51 +02:00
Raphaël Doursenaud
f01e76f686 Removed unmaintaned OScommerce module 2014-09-29 15:22:48 +02:00
Florian HENRY
ce145cc056 Add cache excel export on harddrive with 
MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR const. It can avoid lot's of stack
overflow on large excel export
 2014-09-29 10:16:48 +02:00
Regis Houssin
f233d4f610 New: add doc models management in contract module 2014-09-28 20:39:02 +02:00
aspangaro
250b57ca0a Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-09-28 14:00:26 +02:00
Laurent Destailleur
c2cbbffd12 Fix: duplicate field 2014-09-24 17:30:49 +02:00
Florian HENRY
14ca936cfc set ref_supplier for contract field 2014-09-24 10:21:26 +02:00
Laurent Destailleur
40c1b02a6c Correction repair.sql 2014-09-24 01:15:34 +02:00
Laurent Destailleur
f6445f9cef Fix: Pb into repair function 2014-09-24 00:51:36 +02:00
aspangaro
a58025c601 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-09-23 21:24:29 +02:00
Laurent Destailleur
dd86453020 Add field color into table of type of events 2014-09-23 17:54:03 +02:00
Laurent Destailleur
7224f64224 Work on multi user for events. 
Fix: Modules must be reloaded after migration.
 2014-09-23 16:15:15 +02:00
Laurent Destailleur
640bf7c34b Uniformize field name 2014-09-23 12:18:42 +02:00
Laurent Destailleur
e1fec958ef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/user/group/fiche.php
 2014-09-22 23:43:22 +02:00
Alexis Algoud
de0d53a2bb ADD extrafields on usergroup 2014-09-22 16:31:58 +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
aspangaro
08b9e05425 New Module : Manage Financial Loan 2014-09-21 17:42:38 +02:00
Laurent Destailleur
ee4d697172 Fix several bugs reported by scrutinizer 2014-09-19 14:57:31 +02:00
Laurent Destailleur
f9976bdb6a Qual: Uniformize field names. 2014-09-19 11:03:07 +02:00
Laurent Destailleur
f2acb048cc Qual: Uniformize fields name. 2014-09-18 18:02:22 +02:00
Laurent Destailleur
9666d5e3ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/.gitignore
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
 2014-09-18 10:17:43 +02:00