6064 Commits

Author	SHA1	Message	Date
Laurent Destailleur	bb2c33e2c1	Trad	2015-02-15 22:49:53 +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	3b09dc53cd	Fix regression on total visible on invoice since situation invoice.	2015-02-14 20:32:11 +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	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	e4e49e8a0b	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/product/stock/product.php	2015-02-12 15:41:48 +01:00
Laurent Destailleur	206a453ce2	Solve confusion into number of order or qty into order.	2015-02-12 15:40:06 +01:00
Laurent Destailleur	c727e2b8ec	Fix bad translation ... Conflicts: htdocs/product/stock/product.php	2015-02-12 15:29:21 +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
Laurent Destailleur	b49c8f84b6	Fix bad translation	2015-02-12 15:22:04 +01:00
Laurent Destailleur	689354f927	New: A default label is suggested for stock correction and transfer ... instead of empty string.	2015-02-11 23:54:42 +01:00
Laurent Destailleur	179cbbd187	Maxi debug and enhancement of module batch.	2015-02-11 22:54:06 +01:00
Laurent Destailleur	b9d2de99e1	Translation	2015-02-11 14:46:16 +01:00
Laurent Destailleur	8a6d3aa633	Clean module print system	2015-02-11 14:22:44 +01:00
Laurent Destailleur	d5ec19ef83	Enhance help when running cron script from command line	2015-02-11 13:21:12 +01:00
Laurent Destailleur	e3885d6d73	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/core/lib/tax.lib.php	2015-02-10 21:36:38 +01:00
Laurent Destailleur	ddb95e5765	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/comm/mailing/fiche.php htdocs/compta/paiement/liste.php htdocs/contact/class/contact.class.php htdocs/core/lib/tax.lib.php htdocs/core/modules/expedition/doc/pdf_merou.modules.php htdocs/core/modules/expedition/doc/pdf_rouget.modules.php htdocs/langs/en_US/agenda.lang htdocs/webservices/server_contact.php	2015-02-10 21:33:43 +01:00
Laurent Destailleur	abcf4480de	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-02-10 21:02:23 +01:00
Laurent Destailleur	fce7a0e36e	Bad translation	2015-02-10 21:01:44 +01:00
KreizIT	2483d96b33	FIXED: #1829 POS not compatible with batch products	2015-02-09 17:19:20 +01:00
phf	34bc1dbc15	Merge branch 'develop' into new_ask_price	2015-02-09 09:07:50 +01:00
Laurent Destailleur	2c730bf61c	Merge pull request #2332 from aspangaro/3.7-patch1 ... FIXED Review	2015-02-08 00:03:11 +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	64963ef9bd	Fix: the syslog handler for chromphp an fiefoxphp was not visible when ... they should not.	2015-02-07 19:12:22 +01:00
aspangaro	63dd237b85	Typo	2015-02-07 15:21:30 +01:00
aspangaro	f23212eb22	Center title column & modify language key	2015-02-07 14:55:56 +01:00
Laurent Destailleur	011d39105d	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/accountancy/admin/export.php htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/core/datepicker.php htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php htdocs/fourn/facture/card.php	2015-02-07 03:28:36 +01:00
Laurent Destailleur	2f388949f6	Make a test with jsganttimproved	2015-02-07 03:11:35 +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
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
Laurent Destailleur	01541e4152	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/comm/action/card.php htdocs/core/datepicker.php	2015-02-03 12:17:45 +01:00
aspangaro	14a078c9a7	FIXED Accountancy clean code	2015-02-03 06:39:44 +01:00
Laurent Destailleur	6e57e41fb0	Translation	2015-02-02 21:55:07 +01:00
Laurent Destailleur	21c78cc392	Merge remote-tracking branch 'origin/3.7' into develop	2015-02-02 21:45:31 +01:00
Laurent Destailleur	5aecfa4cdb	Translation	2015-02-02 21:44:40 +01:00
Laurent Destailleur	e4c5aa30be	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-02-01 01:44:01 +01:00
Laurent Destailleur	a43fcdbb14	Missing entries	2015-02-01 01:43:36 +01:00
Laurent Destailleur	6b27d8d44c	Merge pull request #2298 from ndrosis/patch-16 ... Correct view link	2015-01-31 20:25:11 +01:00
Laurent Destailleur	324ded162d	Merge pull request #2297 from ndrosis/patch-15 ... translate UpdateServerOffline live last version	2015-01-31 20:20:18 +01:00
Laurent Destailleur	d66d4f53a5	Merge branch 'tooltip' of https://github.com/frederic34/dolibarr into ... frederic34-tooltip Conflicts: htdocs/core/boxes/box_produits.php htdocs/core/boxes/box_produits_alerte_stock.php htdocs/product/index.php	2015-01-31 15:41:33 +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	770ddb6b0f	Merge branch 'task-1793' of https://github.com/marcosgdf/dolibarr into ... marcosgdf-task-1793 Conflicts: ChangeLog htdocs/margin/lib/margins.lib.php	2015-01-31 14:29:15 +01:00
frederic34	b850b7b448	Merge remote branch 'upstream/develop' into tooltip ... Conflicts: htdocs/langs/en_US/sendings.lang	2015-01-30 16:45:24 +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
Drosis Nikos	f86db9d686	Correct view link	2015-01-28 23:55:12 +02:00
Drosis Nikos	831bc5393d	translate UpdateServerOffline live last version	2015-01-28 23:17:46 +02:00