lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,423 Commits 43 Branches 150 Tags 886 MiB
92af226fff
Commit Graph

1061 Commits

Author SHA1 Message Date
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
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
5d4d8151c1 Work on new timesheet input pages. 2015-03-18 11:04:50 +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
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
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
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
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
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
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
Laurent Destailleur
7baaf18ad1 Fix can be null 2015-02-28 18:44:06 +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
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
Laurent Destailleur
30a5111c68 Work on expense report module 2015-02-21 15:18:05 +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
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
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
2e0b2fb012 Work on expensereport module 2015-02-15 22:49:23 +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
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
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