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

2657 Commits

Author SHA1 Message Date
Laurent Destailleur
8e9c1c4747 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/list.php
	htdocs/core/class/notify.class.php
	htdocs/core/login/functions_dolibarr.php
	htdocs/exports/export.php
	htdocs/langs/en_US/admin.lang
 2015-04-01 16:33:39 +02:00
Laurent Destailleur
16a620f926 Fix: Deadlock situation (when order were canceled, no way to make 
nothing on it)
Fix: Don't know how I forgot this events into trigger system.
 2015-04-01 16:07:22 +02:00
aspangaro
a92f68a5ed Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 2015-03-29 09:25:06 +02:00
frederic34
82b8fe6b7d Note private and Note public for loan 2015-03-27 17:13:52 +01:00
aspangaro
059bb40345 Debug 2015-03-26 20:43:34 +01:00
aspangaro
2b2b43afb6 Dir "Don" 2015-03-25 22:37:14 +01:00
aspangaro
9d34b40897 Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 
Conflicts:
	htdocs/compta/bank/account.php
 2015-03-24 05:28:57 +01:00
Laurent Destailleur
efe9c21b81 Merge pull request #2382 from aspangaro/develop-loan 
NEW: Module loans
 2015-03-23 23:28:57 +01:00
Laurent Destailleur
3844d4e6f7 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
	htdocs/core/boxes/box_activity.php
	htdocs/fourn/commande/card.php
	htdocs/user/card.php
 2015-03-23 15:16:37 +01:00
aspangaro
be0ab4c9b4 Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-23 06:58:25 +01:00
aspangaro
414d4c6432 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-03-22 18:08:12 +01:00
Laurent Destailleur
55140afde4 Merge branch 'price-global-variables' of 
https://github.com/IonAgorria/dolibarr into
IonAgorria-price-global-variables

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/dynamic_price/editor.php
 2015-03-22 12:45:04 +01:00
Laurent Destailleur
87da1d734e mysql 5.5.41 is still bugged returning "lost connexion" during migration 
but there is no more data loss so we can allow this version. A database
upgrade to 5.6 will be required if this occurs.
 2015-03-22 12:13:26 +01:00
Laurent Destailleur
a55af4387b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	.travis.yml
	htdocs/core/class/notify.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	test/phpunit/AllTests.php
	test/phpunit/MouvementStockTest.php
 2015-03-22 12:10:39 +01:00
aspangaro
462e27e069 Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 2015-03-21 07:13:35 +01:00
aspangaro
15e50ed24f Update works 2015-03-21 06:21:34 +01:00
Laurent Destailleur
eeb09b83a1 The test on db version must not lock the phpunit 2015-03-20 20:50:46 +01:00
Laurent Destailleur
0784e9638a The test on db version must not lock the phpunit 2015-03-20 17:57:40 +01:00
Laurent Destailleur
b0e928c213 Disable migration with bugged versions 2015-03-20 15:26:00 +01:00
Laurent Destailleur
92af226fff Fix Not into official 3.7 but must be into migration for 3.7 when 
migration is done by 3.8 code
 2015-03-20 15:19:42 +01:00
aspangaro
c4a580723d Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-20 06:36:06 +01:00
Laurent Destailleur
6ceda02eaa NEW: Enhancement of module 'Notification by Email'. Show nb of 
notifications set. Can set several emails. Can set a threshold on
amount for notifications. Add notification on supplier order validation.
 2015-03-18 21:44:57 +01:00
Laurent Destailleur
ba526c5a2f Merge remote-tracking branch 'origin/3.7' into develop 2015-03-18 14:32:58 +01:00
Laurent Destailleur
5d4d8151c1 Work on new timesheet input pages. 2015-03-18 11:04:50 +01:00
aspangaro
e6d9d18f25 Update work on donation 2015-03-18 06:29:10 +01:00
aspangaro
4e83952485 Add payment on donation 2015-03-18 05:07:32 +01:00
Laurent Destailleur
37c216cfe4 Fix limit for very slow os. 2015-03-17 15:43:11 +01:00
Scrutinizer Auto-Fixer
b693ed3f51 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-03-16 23:21:17 +00: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
aspangaro
1cd81f0e81 Work on module donations 2015-03-16 06:29:15 +01:00
Laurent Destailleur
60c72e13b3 Some fixes into export and translation 2015-03-15 23:39:53 +01:00
Ion Agorria
e76b6e740f SQL additions 2015-03-14 16:52:01 +01:00
Laurent Destailleur
c06ff8acd9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-14 14:30:09 +01:00
Laurent Destailleur
44d6bdb1c5 Doc 2015-03-14 14:27:45 +01:00
Laurent Destailleur
c45ec24958 Merge pull request #2379 from atm-maxime/develop 
New : replenish function adds new lines into already existing draft supplier order instead of creating a new supplier order
 2015-03-14 14:08:38 +01:00
Juanjo Menent
971f9b0c30 Fix: Migration script 2015-03-13 22:08:24 +01:00
Laurent Destailleur
ba2c0a2651 Clean code of hooks. 
Extrafield index on fk_object must be unique.
 2015-03-13 20:27:54 +01:00
Maxime Kohlhaas
3578ca8baa Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-03-11 08:52:09 +01:00
aspangaro
3897e65425 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-03-11 05:28:59 +01:00
Laurent Destailleur
ec322e2e29 Revert was not complete 2015-03-11 03:03:17 +01:00
Laurent Destailleur
4b8fa00edb Merge pull request #2422 from guedel/sqlite3-dev 
Sqlite3 dev
 2015-03-11 02:54:15 +01:00
Laurent Destailleur
e8732df747 Merge pull request #2441 from aspangaro/develop-ReviewER 
FIXED: Review Expense Report
 2015-03-11 02:14:13 +01:00
Laurent Destailleur
c271257452 Prepare extrafield for option by default into lists 2015-03-10 22:27:16 +01:00
Maxime Kohlhaas
fa628bba6f Fix SQL error when installing 2015-03-10 15:34:48 +01:00
Maxime Kohlhaas
6113a5b0f5 FIX : [bug #1883] missing field in SQL installation 2015-03-10 15:27:36 +01:00
Laurent Destailleur
51b67704ee Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-10 13:46:44 +01:00
Laurent Destailleur
dc30092290 Add column to store salary ref when doing payment. 2015-03-10 10:11:51 +01:00
Laurent Destailleur
94acbeaa22 Prepare perms on extrafields 2015-03-09 21:40:24 +01:00
aspangaro
f3258d59c6 Uniformize status & add price() 2015-03-08 07:21:07 +01:00
Laurent Destailleur
c7c7c393ee sql syntax errors 2015-03-06 02:14:59 +01:00
Laurent Destailleur
560b4541cd Update packager. 2015-03-05 22:08:16 +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
Guillaume de Lestanville
dd2594692e Updating compatibility with Sqlite3 
- Replace USING syntax by IN SELECT syntax
- Fix error on database creation
- Removing test on username parameter when installing.
 2015-03-05 17:35:37 +01:00
Laurent Destailleur
d7ab3f112c NEW: Show difference between timespent by everybody and time spent by 
user making timesheet into timesheet pages.
NEW: Can enter start hours of task when creating timesheet
 2015-03-05 13:48:57 +01:00
guillaume
0ef46b06f4 Sqlite3-PDO restoration 
FR:
- Restauration de la version PDO dans sqlite.class.php et désactivation.
- Ajout de la classe de base de données Sqlite3 dans sqlite3.class.php

EN:
- revert of the PDO version of sqlite.class.php and deactivation.
- add database class Sqlite3 into sqlite3.class.php.
 2015-03-05 10:52:37 +01:00
Laurent Destailleur
5c36db06f6 Add missing files 2015-03-04 23:04:37 +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
f570cd6b42 Forgot to commit tables 2015-03-04 20:35:08 +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
Laurent Destailleur
5335a6affa NEW: Add close date and user for projects. 2015-03-04 16:28:29 +01:00
Laurent Destailleur
60a6d8789f Merge remote-tracking branch 'origin/3.7' into develop 2015-03-04 01:14:27 +01:00
Laurent Destailleur
fa2e57eaa3 pcpcs 2015-03-04 01:10:23 +01:00
aspangaro
c119ce382e Merge remote-tracking branch 'Upstream/develop' into develop-loan 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-02 21:05:38 +01:00
Laurent Destailleur
2f24622a7c NEW: Introduce TCPDI as replacement of FPDI. 2015-03-02 01:38:40 +01:00
Marcos García de La Fuente
eb99202dc2 Little changes 2015-03-02 01:10:31 +01:00
Laurent Destailleur
50d8137618 Merge pull request #2384 from marcosgdf/better-practice 
Better practice in getBrowserInfo
 2015-03-02 00:28:40 +01:00
Laurent Destailleur
2795d27cc9 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
	htdocs/projet/index.php
 2015-03-01 16:13:22 +01:00
Laurent Destailleur
8a00109baf Fix: Several bugs int replenishment feature. 2015-03-01 16:05:20 +01:00
Laurent Destailleur
560f1a43cd Fix: Several bugs int replenishment feature. 2015-03-01 16:04:34 +01:00
Marcos García de La Fuente
b4c84fac9d NEW: [ task #977 ] New option to manage product unit 
Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
 2015-03-01 12:42:38 +01:00
Laurent Destailleur
7baaf18ad1 Fix can be null 2015-02-28 18:44:06 +01:00
Marcos García de La Fuente
60e2524fc2 Merge remote-tracking branch 'upstream/develop' into better-practice 
Conflicts:
	htdocs/core/lib/functions.lib.php
	test/phpunit/FunctionsLibTest.php
 2015-02-28 14:39:14 +01:00
Laurent Destailleur
ef14e4e7ed Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.product.class.php
 2015-02-28 03:11:15 +01:00
Laurent Destailleur
5d1545ad1f Work on supplier order and customer extrafields 
Use templates to show/edit supplier order and invoice lines
 2015-02-27 18:05:12 +01:00
Laurent Destailleur
22318bb800 Fix missing tables 2015-02-26 14:05:23 +01:00
guillaume
207fa671b1 Mise en place de l'initialisation de la base avec PDO SQlite 2015-02-25 09:04:11 +01:00
aspangaro
4803a1fb89 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-02-25 06:59:27 +01:00
Laurent Destailleur
cae82104ca Clean tool to generate checksum file 2015-02-24 12:44:12 +01:00
Laurent Destailleur
9842e816d0 Fix bad sql type 
Fix no input outside tr-td
 2015-02-24 11:24:15 +01:00
Laurent Destailleur
eb4eededbd Add class to manage table commande_fournisseur_dispatch 2015-02-24 11:19:47 +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
phf
81130634d3 [CORE] intégration de incoterm sur les différentes class (#incoterm). 2015-02-23 09:16:14 +01:00
Laurent Destailleur
6e10dd3cce Trad 2015-02-22 17:10:13 +01:00
Laurent Destailleur
2bc6ac4671 Finished new module to manage expense reports ! 
Fix export to support corectly multicompany
 2015-02-22 13:16:49 +01:00
Marcos García de La Fuente
ce916f3bcb Better practice in getBrowserInfo 2015-02-22 12:35:51 +01:00
Laurent Destailleur
30a5111c68 Work on expense report module 2015-02-21 15:18:05 +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
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
 2015-02-19 00:01:26 +01:00
Laurent Destailleur
2f5c94fb4a Merge pull request #2357 from KreizIT/fix_mssql 
Fix mssql
 2015-02-18 23:32:48 +01:00
Laurent Destailleur
a05e39f119 Merge pull request #2356 from KreizIT/fix_sqldata 
Fix inconsistent data
 2015-02-18 23:31:22 +01:00
Laurent Destailleur
d7dcf28c61 Merge branch '3.7' of https://github.com/atm-gauthier/dolibarr into 
atm-gauthier-3.7

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-02-18 23:15:40 +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
cc1d506614 Miscelaneous debug on barcode features. 2015-02-18 21:01:17 +01:00
Laurent Destailleur
fe50a585fc Fix: removed deprecated menu 2015-02-18 18:47:01 +01:00
Laurent Destailleur
ad67fe50a3 Correct management when delivery date is universal time format. 2015-02-17 17:21:41 +01:00
Laurent Destailleur
23562a01ab Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_US/stocks.lang
 2015-02-16 20:59:04 +01:00
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