dolibarr

Author	SHA1	Message	Date
Laurent Destailleur	aab7aacccf	Bad width	2015-01-23 18:41:53 +01:00
Laurent Destailleur	a4990a58b1	The badge was missing for shipment	2015-01-23 18:39:40 +01:00
Laurent Destailleur	083cf06908	Fixed: Tracking number restored on PDF shipments Fixed: Translation	2015-01-23 18:33:33 +01:00
Laurent Destailleur	5306220e5e	Fixed: Translation	2015-01-23 02:21:43 +01:00
Laurent Destailleur	2e7bfa856a	Fixed: bad url	2015-01-22 23:49:32 +01:00
Laurent Destailleur	b7328caa9a	Fixed: Bad date for supplier orders	2015-01-22 20:40:53 +01:00
Laurent Destailleur	8267cec5a3	Fix: select if field is null	2015-01-22 20:10:25 +01:00
Laurent Destailleur	0f7238937a	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/fourn/commande/fiche.php	2015-01-22 18:55:26 +01:00
Laurent Destailleur	639d582a44	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-01-22 18:44:21 +01:00
Laurent Destailleur	36c083e9db	Fixed: Refresh was doing update	2015-01-22 18:44:02 +01:00
Laurent Destailleur	e31decb3cf	Merge pull request #2271 from aspangaro/3.7 Correct link	2015-01-22 13:57:30 +01:00
Laurent Destailleur	4bb86717cf	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-01-22 12:30:18 +01:00
Laurent Destailleur	31be2563c2	Fixed: Allow external module a chance to fix regression.	2015-01-22 12:29:55 +01:00
aspangaro	6f3d9200bf	Correct link	2015-01-22 07:15:14 +01:00
jean	b809f0aeb8	Merge remote-tracking branch 'origin/3.6' into 3.6	2015-01-20 17:31:17 +01:00
jean	5ec0b32ab0	add left joins on llx_c_actiocomm	2015-01-20 17:26:32 +01:00
Laurent Destailleur	8d0c8b888d	Merge pull request #2263 from frederic34/patch-1 Use account defined in invoice for pdf doc	2015-01-19 15:31:26 +01:00
Laurent Destailleur	e14684c417	Merge pull request #2259 from marcosgdf/misc-fixes misc-fixes	2015-01-19 15:28:28 +01:00
Frédéric FRANCE	69bb4b7b0b	Use account defined in invoice for pdf doc	2015-01-18 23:00:26 +01:00
Laurent Destailleur	1dd76e2ec0	Avoid request if possible	2015-01-18 19:15:23 +01:00
Laurent Destailleur	5c5ff72ecd	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: ChangeLog htdocs/adherents/fiche.php htdocs/comm/fiche.php htdocs/comm/mailing/fiche.php htdocs/comm/propal.php htdocs/comm/propal/class/propal.class.php htdocs/commande/class/commande.class.php htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/compta/paiement.php htdocs/core/class/html.formcompany.class.php htdocs/core/tpl/login.tpl.php htdocs/expedition/fiche.php htdocs/fourn/commande/fiche.php htdocs/fourn/facture/fiche.php htdocs/fourn/facture/paiement.php htdocs/fourn/fiche.php htdocs/main.inc.php htdocs/product/fournisseurs.php htdocs/resource/card.php	2015-01-18 17:13:42 +01:00
Marcos García de La Fuente	55b8c28100	Corrected weird typo	2015-01-18 16:28:42 +01:00
Marcos García de La Fuente	0b18ce5fc4	PHPDoc + missing return statements	2015-01-18 16:16:46 +01:00
Laurent Destailleur	08214999a7	Merge remote-tracking branch 'origin/3.5' into 3.6	2015-01-18 15:21:38 +01:00
Laurent Destailleur	959fe14856	Merge pull request #2256 from marcosgdf/bug-1735 Fix: [ bug #1735 ] Rights to delete expense notes no longer there - cannot delete expense notes	2015-01-18 15:14:23 +01:00
Laurent Destailleur	7b7b8f376f	Merge branch 'bug-1784' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1784 Conflicts: ChangeLog	2015-01-18 15:13:26 +01:00
Laurent Destailleur	ff65035aee	Merge branch 'bug-1717' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1717 Conflicts: ChangeLog	2015-01-18 15:12:00 +01:00
Laurent Destailleur	d1e2ab6f56	Merge branch 'bug-1783' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1783 Conflicts: ChangeLog	2015-01-18 15:10:30 +01:00
Laurent Destailleur	7c5927ef93	Merge branch 'bug-1796' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1796 Conflicts: ChangeLog	2015-01-18 15:08:49 +01:00
Laurent Destailleur	b3e216b8f1	Merge branch 'bug-1787' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1787 Conflicts: ChangeLog htdocs/comm/propal.php	2015-01-18 15:06:54 +01:00
Laurent Destailleur	c35de1aa06	Merge branch 'bug-1803' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1803 Conflicts: ChangeLog	2015-01-18 15:01:18 +01:00
Laurent Destailleur	cef48d1275	Merge branch 'bug-1804' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1804 Conflicts: ChangeLog	2015-01-18 14:02:52 +01:00
Laurent Destailleur	cf3a8f5a71	Merge pull request #2245 from KreizIT/fix_defaultE37 Fix Creating default object from empty on supplier order confirmation	2015-01-18 14:01:57 +01:00
Laurent Destailleur	0513ce25e5	Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 Conflicts: ChangeLog	2015-01-18 13:51:45 +01:00
Laurent Destailleur	8644407c0a	Merge pull request #2230 from defrance69/patch-42 Update card.php	2015-01-18 13:44:35 +01:00
Laurent Destailleur	05f08a7181	Merge branch 'bug-1762' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1762 Conflicts: ChangeLog	2015-01-18 13:43:57 +01:00
frederic34	d45750d914	Ignore content of directory custom Conflicts: htdocs/custom/.gitignore	2015-01-18 13:07:39 +01:00
Laurent Destailleur	b1f889e1d1	Merge remote-tracking branch 'origin/3.5' into 3.6	2015-01-18 12:46:23 +01:00
Laurent Destailleur	2f4352c759	Merge branch 'bug-1785' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1785 Conflicts: ChangeLog	2015-01-18 12:45:05 +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	4639ce3364	Merge branch 'bug-1802' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1802 Conflicts: ChangeLog	2015-01-18 12:37:16 +01:00
Laurent Destailleur	ef802d9c39	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 Conflicts: htdocs/comm/action/class/actioncomm.class.php	2015-01-18 12:31:01 +01:00
Laurent Destailleur	6a294eb02a	Fixed: Better fix for backward compatibility	2015-01-18 12:29:55 +01:00
Laurent Destailleur	012c571a6c	Fixed: Backward compatibility	2015-01-18 11:50:53 +01:00
Marcos García de La Fuente	be3527abd1	Fixed some errors of Bookkeeping class	2015-01-18 03:23:00 +01:00
Marcos García de La Fuente	71e5cf07c6	Fix: [ bug #1735 ] Rights to delete expense notes no longer there - cannot delete expense notes	2015-01-18 03:12:46 +01:00
Marcos García de La Fuente	78905c6af1	Fix: [ bug #1784 ] « Message page de connexion » n'apparaît pas	2015-01-17 20:29:51 +01:00
Marcos García de La Fuente	003aa5ee44	Fix: [ bug #1717 ] Sorting unpaid invoices by amount received brings due amount	2015-01-17 19:41:31 +01:00
Marcos García de La Fuente	dacec491ff	Fix: [ bug #1783 ] SQL error when enabling 3rd party module with PostgreSQL and MySQL strict mode ON	2015-01-17 19:37:49 +01:00
Marcos García de La Fuente	7f59cf9194	Fix: [ bug #1787 ] Incorrect behaviour of doActions hook	2015-01-17 19:28:27 +01:00
Marcos García de La Fuente	cc9197e4c8	Fixed problem with Fichinter::getNextNumRef	2015-01-17 19:13:38 +01:00
Marcos García de La Fuente	41e01a22a3	Fixed loading of external numeration modules in Contrat, Commande, Facture, Contrat, Expedition, Fichinter, CommandeFournisseur and uniformized code	2015-01-17 18:58:05 +01:00
Marcos García de La Fuente	ed839114ab	Fixed loading of external numeration modules in FactureFournisseur and Propal	2015-01-17 18:42:19 +01:00
Marcos García de La Fuente	068045f6a0	Fix: [ bug #1803 ] AJAX company contact input is not aligned	2015-01-17 18:23:20 +01:00
Marcos García de La Fuente	a64084308d	Fix: [ bug #1804 ] SQL error when sending email without addresee	2015-01-17 18:12:43 +01:00
Laurent Destailleur	06eda34b56	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-01-17 16:40:53 +01:00
Laurent Destailleur	9876b30387	Need more info to find bugs	2015-01-17 16:22:37 +01:00
Juanjo Menent	0d4aad4111	Fix: PostgreSQL compatibilty Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php	2015-01-16 17:59:58 +01:00
Juanjo Menent	fe5533d1c3	Fix: PostgreSQL compatibilty	2015-01-16 17:41:56 +01:00
Laurent Destailleur	6a900598a3	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-01-16 15:13:48 +01:00
Laurent Destailleur	41890d0a0b	Fixed: Translation of module name and desc was not used for external modules.	2015-01-16 14:38:00 +01:00
Laurent Destailleur	d1a0187f82	Merge pull request #2236 from marcosgdf/translations Corrected translation typos	2015-01-16 12:10:32 +01:00
Laurent Destailleur	767afd3c9f	Merge pull request #2231 from KreizIT/fix_cron Fix cron	2015-01-16 12:08:30 +01:00
Laurent Destailleur	6f00cecd81	Merge pull request #2244 from KreizIT/fix_default_empty FIX : Creating default object from empty when validating supplier order	2015-01-16 12:03:23 +01:00
KreizIT	a9008c4993	Fix Creating default object from empty on supplier order confirmation	2015-01-15 17:40:15 +01:00
Cedric	999a6052ff	FIX : Creating default object from empty when validating supplier order	2015-01-15 16:23:10 +01:00
Marcos García de La Fuente	61809ef6b5	- Fix: [ bug #1802 ] SQL error when updating a task with PostgreSQL database	2015-01-15 13:22:58 +01:00
Marcos García de La Fuente	88c3509dd0	Merge remote-tracking branch 'upstream/3.6' into 3.6 Conflicts: ChangeLog	2015-01-15 13:09:23 +01:00
Marcos García de La Fuente	71b609fab0	Fix: [ bug #1801 ] FAC_FORCE_DATE_VALIDATION constant alters supplier invoice date given to numeration modules	2015-01-15 13:08:33 +01:00
Juanjo Menent	f03ffaf5a3	Fix: withdrawal create error if in the same month are deleted previus withdrawals. Conflicts: ChangeLog	2015-01-15 10:00:52 +01:00
Juanjo Menent	d40eab2494	Fix: withdrawal create error if in the same month are deleted previus withdrawals.	2015-01-15 09:57:20 +01:00
Laurent Destailleur	e20c1decdf	Fixed: object instead of soc and vis versa.	2015-01-15 03:51:47 +01:00
Laurent Destailleur	c5a3b4481e	Fixed: use object	2015-01-15 03:11:06 +01:00
Laurent Destailleur	d16ce7eb96	Fix: Bad var	2015-01-15 02:42:41 +01:00
Laurent Destailleur	362167f319	Fixed: Export was not using user assigned	2015-01-15 02:32:15 +01:00
Laurent Destailleur	4d67e6f4d4	Add ignore	2015-01-15 02:11:22 +01:00
Laurent Destailleur	ccfbd3614e	Not nice looking	2015-01-15 02:09:28 +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	68441a563a	Fixed: Avoid space into address string	2015-01-14 19:17:58 +01:00
Laurent Destailleur	4c64b8ceae	Add menu image	2015-01-14 19:12:22 +01:00
Laurent Destailleur	e3f3956bed	Sec: Bad security test	2015-01-14 19:11:56 +01:00
Laurent Destailleur	806477977d	Fix: css	2015-01-14 13:51:21 +01:00
Laurent Destailleur	a886136e67	More comment and add a unit test to check that {t} tag is correctly supported.	2015-01-13 22:13:15 +01:00
Marcos García de La Fuente	4da52cf733	Fix: [ bug #1797 ] Tulip Supplier invoice module takes creation date instead of invoice date	2015-01-13 11:11:37 +01:00
Marcos García de La Fuente	7b4cf976df	Corrected translation typos	2015-01-13 09:42:46 +01:00
Marcos García de La Fuente	85b1188593	Fix: [ bug #1788 ] Duplicated doActions hook in product/fournisseurs.php	2015-01-13 09:22:12 +01:00
Marcos García de La Fuente	6c4702f282	Fix: [ bug #1785 ] Start date is lost in Project > Linked objects	2015-01-13 09:11:04 +01:00
Marcos García de La Fuente	7e16d0c1d3	Fix: [ bug #1792 ] Users are not allowed to see margins module index page when no product view permission is enabled	2015-01-13 01:48:58 +01:00
Laurent Destailleur	dc0d12eccd	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-01-12 19:00:29 +01:00
Laurent Destailleur	58e4e01db7	Sync transifex	2015-01-12 18:59:46 +01:00
Laurent Destailleur	31fd03790e	Fixed: Prices visible into stock tab. Conflicts: htdocs/product/stock/product.php	2015-01-12 18:26:11 +01:00
Cedric	d2cd841573	Fix divide by zero error	2015-01-12 13:23:18 +01:00
Cedric	26cad2400e	Fix missing lang key	2015-01-12 13:18:50 +01:00
BENKE Charles	b6b84e235c	Update card.php hide line with empty duration if FICHINTER_HIDE_EMPTY_DURATION is activate	2015-01-12 10:16:34 +01:00
Laurent Destailleur	a77a604082	Fix: include custom dir so everybody has it.	2015-01-11 15:32:11 +01:00
Laurent Destailleur	e4b89779f7	Fixed: css conflict	2015-01-10 21:39:40 +01:00
Laurent Destailleur	c441aa89db	Fixed: Avoid warning	2015-01-10 18:19:44 +01:00
Laurent Destailleur	90add2fa96	Fix: amarok is a bugged theme making dolidroid failed. We swith to eldy automatically with dolidroid.	2015-01-10 17:23:52 +01:00
Laurent Destailleur	dda12003d4	Fixed: User of creation was not visible.	2015-01-10 12:23:15 +01:00
Laurent Destailleur	30d1284379	Fixed: Missing ref_ext	2015-01-10 01:15:39 +01:00
Laurent Destailleur	87f70f2d22	Fixed: property must be called billed into web service. Fixed: web service to create order was useless. it was not possible to change status.	2015-01-10 01:07:18 +01:00
Laurent Destailleur	f7960ec104	Fixed: Upgrade are done several times	2015-01-09 23:19:18 +01:00
fentman	9049931ff0	Change to $listofcurrenciesbefore for GBP + AUD Update of functions.lib.php - function price() $listofcurrenciesbefore to include USD, GBP, and AUD to support $ and £ appearing before amounts on invoices not after the amount	2015-01-09 22:55:17 +01:00
Laurent Destailleur	dbcaeb01c0	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: ChangeLog htdocs/commande/class/commande.class.php htdocs/filefunc.inc.php	2015-01-09 22:40:45 +01:00
Laurent Destailleur	32edb33411	Start 3.6.3	2015-01-09 22:32:25 +01:00
Laurent Destailleur	068ae7f0d4	- Fix: ref_ext was not saved when recording a customer order from web service	2015-01-09 22:32:00 +01:00
Laurent Destailleur	f54e90c9cf	Better doc to install external modules. Custom dir will be installed by default.	2015-01-09 13:00:10 +01:00
Laurent Destailleur	b220bb7b1d	Fixed: Size too low	2015-01-07 11:14:51 +01:00
Laurent Destailleur	f8792bdbc7	Fixed: Add opensurvey into list of reloaded modules for 3.7	2015-01-07 11:11:40 +01:00
Laurent Destailleur	4ee308c77b	Fixed: Filter lost after search on date	2015-01-06 20:58:23 +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	4ce7a27dca	Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6	2015-01-06 00:28:07 +01:00
Laurent Destailleur	a668d163fd	Repair corrupted data	2015-01-06 00:27:35 +01:00
Laurent Destailleur	b919318b53	Merge pull request #2213 from marcosgdf/opensurvey Fixed error deleting survey comment	2015-01-06 00:21:32 +01:00
Laurent Destailleur	443c9d245e	Merge pull request #2212 from marcosgdf/misc-doc Miscellaneous corrections	2015-01-06 00:21:05 +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	3f7aab93e5	Merge pull request #2204 from defrance69/patch-39 Update facture.php	2015-01-06 00:14:42 +01:00
Laurent Destailleur	e5f81b1fec	Merge pull request #2202 from defrance69/patch-38 Update facture.php	2015-01-06 00:13:55 +01:00
Laurent Destailleur	337d055872	Merge pull request #2199 from altatof/3.6 FIX: dont remove price ht if it is forced (ie: calculated by margin rate and cost price, or by external module)	2015-01-06 00:10:08 +01:00
Laurent Destailleur	561ace5b0c	Merge pull request #2219 from ndrosis/patch-11 Fix Lang for Check Payment Type	2015-01-06 00:07:38 +01:00
Laurent Destailleur	6a6c5c54f1	Merge pull request #2220 from aspangaro/3.7-Auguria Add module accountancy expert in auguria menu	2015-01-06 00:07:26 +01:00
Laurent Destailleur	256cd68404	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-01-06 00:04:51 +01:00
Laurent Destailleur	3794c9305e	Fix: [ bug #1754 ] Error while installing 3.7	2015-01-06 00:04:23 +01:00
Laurent Destailleur	5032f88e9f	Merge pull request #2221 from aspangaro/3.7-Skype Skype :: Better presentation	2015-01-05 23:52:28 +01:00
aspangaro	b4b5b35afa	Skype :: Better presentation	2015-01-04 20:17:49 +01:00
Laurent Destailleur	d8d01090cd	Fixed: Mark function as deprecated	2015-01-04 19:28:05 +01:00
Laurent Destailleur	48818ed2fd	Fixed: Quick solution to solve problem of unknown payment amount for online subscription.	2015-01-04 15:40:01 +01:00
Laurent Destailleur	df3987fa10	Fixed: Bad url link with jquery mobile. We must add rel="external" on all external links.	2015-01-04 14:51:16 +01:00
aspangaro	f14ea7b649	Add module accountancy expert in auguria menu	2015-01-03 15:07:54 +01:00
Drosis Nikos	68049a2f0e	Fix Lang for Check Payment Type	2015-01-02 18:10:47 +02:00
Laurent Destailleur	be34fcfa8a	Removed duplicate link making same thing	2014-12-30 21:33:56 +01:00
Laurent Destailleur	410c8e56c6	Better fix	2014-12-30 04:30:32 +01:00
Laurent Destailleur	3848daeab8	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: build/debian/changelog build/exe/doliwamp/doliwamp.iss build/makepack-dolibarr.pl build/rpm/dolibarr_fedora.spec build/rpm/dolibarr_generic.spec build/rpm/dolibarr_mandriva.spec build/rpm/dolibarr_opensuse.spec htdocs/filefunc.inc.php htdocs/product/stats/facture.php	2014-12-30 04:20:50 +01:00
Marcos García de La Fuente	a9a33479f1	Fixed error deleting survey comment	2014-12-29 03:44:03 +01:00
Marcos García de La Fuente	86100758ff	Miscellaneous corrections	2014-12-28 20:13:15 +01:00
Marcos García de La Fuente	2202380bc2	Improving ContratLigne documentation	2014-12-28 19:36:43 +01:00
Marcos García de La Fuente	7424ee1107	Improving Contrat documentation and fixed some properties usage	2014-12-28 19:28:25 +01:00
Marcos García de La Fuente	ef4d710f78	Improving CommonObject and Contrat documentation	2014-12-28 19:16:14 +01:00
Marcos García de La Fuente	ec7bc21e4c	Fixed undefined variable $pu_ht	2014-12-28 19:01:39 +01:00
Marcos García de La Fuente	0b4bddd738	Fix [ bug #1779 ] Undefined variable $localtaxtx1 and $localtaxtx2 in Contrat::updateline	2014-12-28 18:57:59 +01:00
Marcos García de La Fuente	7670ae46a6	Fix [ bug #1778 ] Cancel button of edit ref. supplier contract card saves changes instead of cancelling	2014-12-28 18:56:23 +01:00
Marcos García de La Fuente	de137dd012	Merge branch 'bug-1767' into bug-1774	2014-12-28 18:16:16 +01:00
Marcos García de La Fuente	1a827a87f3	Merge branch 'bug-1775' into bug-1774	2014-12-28 18:16:02 +01:00
Marcos García de La Fuente	df1f931ab8	Fixed: [ bug #1767 ] Contract document is not generated properly	2014-12-28 18:10:41 +01:00
Marcos García de La Fuente	52b8bb350e	Fixed Contrat::fetch not setting Contrat::date_creation and improved class doc	2014-12-28 18:10:30 +01:00
Marcos García de La Fuente	cd468b65fd	Documented Contrat class	2014-12-28 17:55:21 +01:00
Laurent Destailleur	e70b6714ce	Doxygen (cherry picked from commit `613d1b3`)	2014-12-28 17:50:38 +01:00
Marcos García de La Fuente	584be6a589	Fixed Contrat::fetch	2014-12-28 17:47:13 +01:00
Marcos García de La Fuente	b9d6f2a496	Fix: [ bug #1775 ] New lines can be entered after contract validation	2014-12-28 17:43:25 +01:00
Marcos García de La Fuente	d4e7a97fdb	Fix: [ bug #1774 ] PHP Fatal error when creating a contract with Product module not enabled	2014-12-28 17:31:27 +01:00
Marcos García de La Fuente	98ed747671	Fix: [ bug #1765 ] Unable to create a contract	2014-12-28 17:17:08 +01:00
Marcos García de La Fuente	f738863e51	Revert previous commit	2014-12-28 17:14:11 +01:00
Marcos García de La Fuente	1b693fae7f	Merge branch '3.7' into bug-1765	2014-12-28 17:11:30 +01:00
BENKE Charles	2957c1445e	Update facture.php $soc already filled upper if $socid filled	2014-12-28 12:34:21 +01:00
BENKE Charles	191d4467e3	Update facture.php $soc already filled upper when $socid send	2014-12-28 12:31:27 +01:00
Christophe Battarel	1ab6955494	FIX: dont remove price ht if it is forced (ie: calculated by margin rate and cost price, or by external module)	2014-12-27 11:27:41 +01:00
Laurent Destailleur	c7937a9962	Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6	2014-12-27 02:22:09 +01:00
Laurent Destailleur	953e736a97	Prepare version 3.6.2	2014-12-27 02:21:37 +01:00
Marcos García de La Fuente	95c7ba33ba	Merge branch '3.7' into bug-1765	2014-12-26 12:10:38 +01:00
Marcos García de La Fuente	9f6f90275a	Fix [ bug #1714 ] Id "sall" is used twice in different HTML tags	2014-12-26 12:03:29 +01:00
Juanjo Menent	bdf5f5726f	Fix: Bad order field value	2014-12-26 09:29:27 +01:00
Juanjo Menent	d40229e9cc	Fix: Bad order field value	2014-12-26 09:14:19 +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	75dbcf4a78	Fixed: doxygen	2014-12-26 04:35:48 +01:00
Laurent Destailleur	d18770c1e7	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-12-26 04:16:08 +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	77e48f8c3e	Merge branch 'bug-1768' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1768	2014-12-26 04:12:58 +01:00
Laurent Destailleur	38c9d39c2b	Merge branch 'bug-1757' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1757 Conflicts: ChangeLog	2014-12-26 04:11:15 +01:00
Laurent Destailleur	4e2c321e4d	Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 Conflicts: ChangeLog	2014-12-26 04:09:08 +01:00
Laurent Destailleur	0da1c2e589	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-12-26 04:06:10 +01:00
Laurent Destailleur	420ebe0be9	Fix: Change order to create fields	2014-12-26 04:04:16 +01:00
Laurent Destailleur	3c500158a9	Merge pull request #2187 from marcosgdf/bug-1715 Fix [ bug #1715 ] Valign and width attributes are used in div tags	2014-12-26 04:02:46 +01:00
Laurent Destailleur	5215b1e641	Merge pull request #2186 from marcosgdf/bug-575 Fix [ bug #575 ] GED doesn't works if there is "/" in a mask	2014-12-26 04:02:01 +01:00
Laurent Destailleur	469aba888a	Merge pull request #2184 from marcosgdf/bug-1674 Fix: [ bug #1674 ] PayPal logo copyright issues	2014-12-26 03:52:34 +01:00
Laurent Destailleur	bba8653179	Merge pull request #2183 from marcosgdf/bug-1724 Fix: [ bug #1724 ] Can't add a submenu to projects	2014-12-26 03:50:36 +01:00
Laurent Destailleur	54437703fb	Merge pull request #2177 from frederic34/patch-7 Enhance select_salesrepresentatives with select2	2014-12-26 03:49:43 +01:00
Laurent Destailleur	ade688b589	Merge pull request #2174 from marcosgdf/bug-1723 Fix [ bug #1723 ] Draft tasks?	2014-12-26 03:48:15 +01:00
Laurent Destailleur	b2d27a7d25	Merge pull request #2173 from marcosgdf/translation Fixed string not translated in linked objects of a project	2014-12-26 03:47:56 +01:00
Laurent Destailleur	8d4186f438	Merge pull request #2172 from marcosgdf/bug-1533 Fix: [ bug #1533 ] Links triggers do not show trigger error message	2014-12-26 03:47:05 +01:00
Marcos García de La Fuente	745eece5fe	Fix: [ bug #1761 ] SQL error when installing 3.7 with PostgreSQL	2014-12-26 00:34:57 +01:00
Marcos García de La Fuente	8e47fe9e1c	Fix: [ bug #1757 ] Sorting breaks product/service statistics	2014-12-26 00:19:09 +01:00
Marcos García de La Fuente	1d39c1acc2	Fix: [ bug #1768 ] PHP Warning when error connecting to a PostgreSQL server in install script	2014-12-26 00:12:16 +01:00
Marcos García de La Fuente	f4def9ea28	Fix: [ bug #1769 ] Error when installing to a PostgreSQL DB that contains numbers	2014-12-26 00:07:24 +01:00
Laurent Destailleur	f3fded2a0a	Merge pull request #2171 from marcosgdf/bug-1649 Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify	2014-12-25 23:25:22 +01:00
Laurent Destailleur	224fa14e16	Merge branch 'bug-1731' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1731 Conflicts: ChangeLog	2014-12-25 23:21:48 +01:00
Laurent Destailleur	33045668cd	Merge pull request #2168 from frederic34/patch-5 Translation error	2014-12-25 23:19:42 +01:00
Laurent Destailleur	645bdec432	Merge pull request #2188 from marcosgdf/bug-1763 Fixed [ bug #1763 ] Undefined variable $interface in Project:574	2014-12-25 23:18:07 +01:00
Marcos García de La Fuente	aec1bdb3c4	Fixed [ bug #1766 ] PHP Warning when adding a service to a supplier invoice	2014-12-25 23:08:07 +01:00
Marcos García de La Fuente	5ec38d89ff	Fixed [ bug #1763 ] Undefined variable $interface in Project:574	2014-12-25 22:59:57 +01:00
Marcos García de La Fuente	2616deb58d	Copyright info	2014-12-25 22:52:11 +01:00
Marcos García de La Fuente	eb524cfd29	Copyright info	2014-12-25 22:50:33 +01:00
Marcos García de La Fuente	7b6a4d1bfd	Fix: [ bug #1715 ] Valign and width attributes are used in div tags	2014-12-25 22:50:15 +01:00
Marcos García de La Fuente	ca133d74ac	Corrected key not translated	2014-12-25 22:20:09 +01:00
Marcos García de La Fuente	da7dc2a393	Fix: [ bug #1765 ] Unable to create a contract	2014-12-25 22:02:22 +01:00
Marcos García de La Fuente	1f00794c98	Fixed bug which didn't show documents in auto GED when an object had '/' in its ref	2014-12-25 21:47:39 +01:00
Marcos García de La Fuente	9d82e16506	Resized PayPal logo	2014-12-25 19:17:52 +01:00
Marcos García de La Fuente	f735aa676e	Fix: [ bug #1674 ] PayPal logo copyright issues	2014-12-25 19:16:25 +01:00
Marcos García de La Fuente	146bba90e7	Fix: [ bug #1724 ] Can't add a submenu to projects	2014-12-25 18:42:26 +01:00
Marcos García de La Fuente	09a094104c	Removed duplicated and unused translation key	2014-12-25 18:31:24 +01:00
Marcos García de La Fuente	c050fe2a27	Merge branch '3.6' into bug-1649 Conflicts: ChangeLog	2014-12-25 01:27:57 +01:00
Marcos García de La Fuente	1179f722af	Merge branch '3.7' into bug-1533	2014-12-25 01:26:00 +01:00
Marcos García de La Fuente	82fa3a447b	Merge branch '3.6' into translation	2014-12-25 01:18:58 +01:00
Juanjo Menent	f60d7ea2de	Merge pull request #2176 from marcosgdf/bug-1722 Fix: [ bug #1722 ] Missing link in homepage project's box	2014-12-24 14:41:47 +01:00
Marcos García de La Fuente	b68276637b	Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks Conflicts: htdocs/core/lib/functions2.lib.php	2014-12-24 14:31:17 +01:00
Laurent Destailleur	a111c4765c	Fixed: Filter lost with navigation	2014-12-23 18:00:14 +01:00
Laurent Destailleur	b7dbb1e9cd	Fixed: Do not show disabled user when creating a new event.	2014-12-23 17:46:30 +01:00
Frédéric FRANCE	d03cc03cd7	Enhance select_salesrepresentatives with select2	2014-12-23 16:42:05 +01:00
Marcos García de La Fuente	034455fc2d	Fix: [ bug #1722 ] Missing link in homepage project's box	2014-12-23 16:37:53 +01:00
Marcos García de La Fuente	416f13c708	Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H	2014-12-23 16:00:04 +01:00
Marcos García de La Fuente	743867b91b	Spanish translation	2014-12-23 15:57:30 +01:00
Marcos García de La Fuente	78307a748d	Corrected confusing table header in task list	2014-12-23 15:56:29 +01:00
Marcos García de La Fuente	a90a03412a	Fixed string not translated in linked objects of a project	2014-12-23 15:43:45 +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
Laurent Destailleur	aa618d481b	Fixed: [ bug #1690 ] Sorting on salary table triggers SQL errors	2014-12-23 13:07:16 +01:00
Laurent Destailleur	9e2f57007b	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-12-23 12:59:54 +01:00
Laurent Destailleur	acf7b9f130	Because this is a legal issue (OPCA), i added the hidden constant for 3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button "Classified Billed" is visible on proposal even if there is no invoice linked to proposal. Fixed: Also fix get list of invoice that report too many data.	2014-12-23 12:59:34 +01:00
Laurent Destailleur	e8addcb8ba	Fixed: [ bug #1756 ] PHP error while removing an import profile	2014-12-23 12:25:21 +01:00
Marcos García de La Fuente	8a14409974	Fix: [ bug #1533 ] Links triggers do not show trigger error message	2014-12-23 11:39:43 +01:00
Marcos García de La Fuente	3212fd2b27	Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify	2014-12-23 11:00:18 +01:00
Marcos García de La Fuente	db30186386	Fix: [ bug #1731 ] Can't use quick navigation on project tasks secondary tabs	2014-12-22 22:52:43 +01:00
Marcos García de La Fuente	46fe2c67e0	Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks	2014-12-22 22:32:05 +01:00
Frédéric FRANCE	748bef6134	Translation error	2014-12-22 20:02:53 +01:00
Laurent Destailleur	51a26ea5a9	Merge pull request #2163 from frederic34/patch-1 Typo on conf variable	2014-12-22 09:52:46 +01:00
Laurent Destailleur	22a7123cd9	Merge pull request #2164 from frederic34/patch-5 Admin config for ask for payment bank during order	2014-12-22 09:52:08 +01:00
Laurent Destailleur	e6d2bc0bff	Maj icon	2014-12-22 03:12:01 +01:00
Laurent Destailleur	1dc2bbb0f1	Fixed: Var no declared	2014-12-22 03:01:31 +01:00
Laurent Destailleur	46fdd19389	Update image for menu	2014-12-22 02:54:38 +01:00
Laurent Destailleur	31f782ffe9	Fix: Several fixes into tasks and time spent management	2014-12-21 14:58:18 +01:00
Laurent Destailleur	bdb47921e7	Fixed: Bad value for % increase for first year.	2014-12-21 14:15:36 +01:00
Frédéric FRANCE	82d403c347	Update admin.lang	2014-12-21 10:39:54 +01:00
Frédéric FRANCE	3d9ce4c1dc	Admin config for ask for payment bank during order	2014-12-21 10:32:11 +01:00
Frédéric FRANCE	6f4ba2552d	Typo on conf variable	2014-12-21 10:14:51 +01:00
Laurent Destailleur	22c27e8703	PHPCS	2014-12-21 02:21:12 +01:00
Laurent Destailleur	268723be7b	Fixed: sql syntax error	2014-12-21 01:39:20 +01:00
Laurent Destailleur	c05c2fe427	Info to help debug perf pb.	2014-12-20 18:46:29 +01:00
Laurent Destailleur	219cd0f855	Fixed: Translation	2014-12-20 15:52:50 +01:00
Laurent Destailleur	74d5e11831	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-12-20 15:42:30 +01:00
Laurent Destailleur	8996953077	Fix: error reported by scrutinizer	2014-12-20 15:42:03 +01:00
Laurent Destailleur	b0ae8cfb9e	Merge pull request #2161 from fappels/3.7 FIX: check for expedition batch lines	2014-12-20 13:20:24 +01:00
Laurent Destailleur	c9f3267649	Fixed: bad conditions	2014-12-20 11:34:37 +01:00
Laurent Destailleur	854ed90a62	Fixed: bad place for the ajaxcombo.	2014-12-20 11:15:10 +01:00
Laurent Destailleur	beaec59ab6	PHPCS	2014-12-20 00:29:53 +01:00
Francis Appels	747b2af06b	FIX: check for expedition batch lines check if expedition batch lines are available before foreach	2014-12-19 11:57:47 +01:00
Laurent Destailleur	c571013fc9	Merge remote-tracking branch 'origin/3.6' into 3.7	2014-12-18 23:55:07 +01:00
Juanjo Menent	57918fe4f6	Trad: Update es_ES from transifex	2014-12-18 23:02:21 +01:00
Juanjo Menent	229e87adc1	Trad: Update es_ES from transifex	2014-12-18 22:35:59 +01:00
Florian HENRY	6f43206331	Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6	2014-12-18 15:42:44 +01:00
Florian HENRY	c209d16881	[ bug #1749 ] Undefined $mailchimp	2014-12-18 15:42:28 +01:00
Laurent Destailleur	38ba6ac75b	Fixed: pgsql to make order	2014-12-18 11:48:30 +01:00
Laurent Destailleur	ef5035b349	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/core/class/commonobject.class.php htdocs/product/liste.php	2014-12-18 11:42:55 +01:00
Laurent Destailleur	2c01a46774	Merge remote-tracking branch 'origin/3.5' into 3.6 Conflicts: htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php htdocs/paypal/lib/paypal.lib.php	2014-12-18 10:13:25 +01:00
Laurent Destailleur	87ec59a05c	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-12-18 10:10:09 +01:00
Laurent Destailleur	d9aba405dd	Fix: utf must be default value.	2014-12-18 10:09:47 +01:00
Laurent Destailleur	f5da9b5e33	Merge pull request #2149 from altatof/3.5 FIX: dont put a mess with date and datetime extrafield value if already in right format	2014-12-18 10:04:03 +01:00
Laurent Destailleur	6728ad3c37	Merge pull request #2148 from altatof/fixhook FIX: hook insertExtraFields must return a returnvalue (0,1,-1)	2014-12-18 10:03:32 +01:00
Laurent Destailleur	4887f51174	Merge pull request #2158 from altatof/fix_fichinter_pdf_pagebreak FIX: pagebreak on fichinter like in other documents	2014-12-18 10:02:25 +01:00
Laurent Destailleur	615456382d	Merge pull request #2157 from altatof/fix_margin_jalon FIX: avoid milestones in margin calculation	2014-12-18 10:01:11 +01:00
Laurent Destailleur	daa98f508c	Merge pull request #2156 from FHenry/3.7 Change credential test data in WS demo	2014-12-18 10:00:46 +01:00
Francis Appels	722fdaa4eb	Fix: check warehouse on product batch Only check warehouse on actions 'create' and 'add'	2014-12-17 15:58:48 +01:00
Francis Appels	f7d2d0e81f	Revert "Fix: check warehouse on product batch" This reverts commit `a06c5b251e`.	2014-12-17 15:51:12 +01:00
Francis Appels	a06c5b251e	Fix: check warehouse on product batch Only check warehouse when on actions 'create' and 'add'	2014-12-17 15:49:51 +01:00
Laurent Destailleur	d98f36bd8f	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-12-17 01:56:52 +01:00
Laurent Destailleur	849628f020	Fix: Typo and translation	2014-12-17 01:56:36 +01:00
Christophe Battarel	c9f69279c7	FIX: pagebreak on fichinter like in other documents	2014-12-16 16:21:31 +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
Laurent Destailleur	1850ebe33a	VAT setup for canada was rong	2014-12-16 01:41:49 +01:00
Christophe Battarel	a4a1a991b8	FIX: avoid milestones in margin calculation	2014-12-15 14:13:57 +01:00
Florian HENRY	5745029942	Change credential test data in WS demo	2014-12-15 11:33:09 +01:00
Laurent Destailleur	bdf8189d20	Fixed: CSS	2014-12-15 10:40:39 +01:00
Laurent Destailleur	d2398dd1b1	Sync from transifex	2014-12-15 10:31:40 +01:00
Laurent Destailleur	bd34f4e247	Fixed: Typo	2014-12-14 22:26:58 +01:00
Laurent Destailleur	8e6d30589d	Fixed: Size too low	2014-12-14 20:51:28 +01:00
Laurent Destailleur	0b6ff8f9bc	Fix: Debug of feature PRODUIT_CUSTOMER_PRICES_BY_QTY. Dev seems to not be finished. We keep it as development status.	2014-12-14 20:41:11 +01:00
Laurent Destailleur	c6bb5904e7	Fixed: Cancel button not correctly supported	2014-12-14 16:01:25 +01:00
Laurent Destailleur	c0afd4f174	Fixed: [ bug #1654 ] Can't display margins in product card	2014-12-14 15:44:22 +01:00
Laurent Destailleur	2245361a2e	Fixed: [ bug #1732 ] Tasks ressources and time consumption are not deleted on project / task deletion	2014-12-14 15:09:30 +01:00
Laurent Destailleur	fae1cd1d21	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-12-14 12:36:27 +01:00
Laurent Destailleur	da3bc3868d	Fixed: Duplicated lang key	2014-12-14 11:46:21 +01:00
Juanjo Menent	3ee2ced22a	Trad: Update es_ES from transifex	2014-12-13 01:28:23 +01:00
Christophe Battarel	27b47a4f48	FIX: dont put a mess with date and datetime extrafield value if already in right format (the bug was in propale/order/invoice extrafields, mainly visible with 2 datetime extrafields)	2014-12-12 14:31:36 +01:00
Christophe Battarel	a1bba472a0	FIX: hook insertExtraFields must return a returnvalue (0,1,-1)	2014-12-12 11:57:20 +01:00
Laurent Destailleur	627e344c78	Documentation of external link.	2014-12-11 14:43:14 +01:00
Laurent Destailleur	c994fbe44d	Fixed: Bad style	2014-12-11 14:31:47 +01:00
Laurent Destailleur	03cfff66ea	Fixed: no form into table	2014-12-11 14:26:34 +01:00
Laurent Destailleur	036914756b	Fixed: option CONTRACT_SUPPORT_PRODUCTS not correctly supported	2014-12-11 14:15:40 +01:00
Laurent Destailleur	c0473f0246	Fixed: when transvers_mode is on, a user is not linked to a dedicated environment (always entity 1), so we should not show info not reliable with this mode.	2014-12-11 13:13:11 +01:00
Laurent Destailleur	a4e0de0d8a	Fixed: Contract must use serpis if no config set Fixed: Missing fetch_thirdparty.	2014-12-11 13:12:05 +01:00
Laurent Destailleur	67cf3cb99b	Fixed: BIC/SWIFT and IBAN must be at same level	2014-12-11 10:13:44 +01:00
Laurent Destailleur	b681885542	Fixed: Bad url link	2014-12-10 21:14:59 +01:00
Laurent Destailleur	99e5715f28	Fixed: Length too small to see fullname.	2014-12-10 20:09:48 +01:00
Laurent Destailleur	cd6c72b142	Fixed: Update of time consumed	2014-12-10 20:03:39 +01:00
Laurent Destailleur	7834a9b099	Add hidden constant to solve bug of too low size to see products label.	2014-12-10 00:51:57 +01:00
Laurent Destailleur	9be99b2987	Fixed: We must use PMP of product. Not warehouse.	2014-12-09 14:27:02 +01:00
Laurent Destailleur	6a70af2b67	Fixed: bug into produc batch management	2014-12-09 14:03:10 +01:00
Laurent Destailleur	63f2bfed24	Fixed: Maxi debug of withdrawal module.	2014-12-09 11:19:16 +01:00
aspangaro	81dc1415de	Untranslatable token in activity box	2014-12-09 05:04:39 +01:00
aspangaro	666e66e78f	Correct link in activity box	2014-12-09 05:04:12 +01:00
Laurent Destailleur	b11ac14cf0	Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5	2014-12-09 01:13:34 +01:00
Laurent Destailleur	1461072801	Fix: Paypal link were broken dur to SSL v3 closed.	2014-12-09 01:12:52 +01:00
Laurent Destailleur	5f8919c857	Update translation	2014-12-08 23:59:33 +01:00
Laurent Destailleur	a8052d8ea4	Fixed: Several fix in color management (function at wrong place, mark param that are deprecated, convertion of value to get correct format in all situation)	2014-12-08 19:12:27 +01:00
Laurent Destailleur	f1ec0348ce	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-12-08 17:31:25 +01:00
Laurent Destailleur	bd91603cd8	Fixed: form outside table	2014-12-08 17:28:26 +01:00
Laurent Destailleur	1616f05068	Fixed: missing css	2014-12-08 02:51:26 +01:00
Laurent Destailleur	ea687b4957	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-12-08 00:30:42 +01:00
Laurent Destailleur	d9e5a597e4	Fixed: Avoid wrapping of help text	2014-12-08 00:29:33 +01:00
Laurent Destailleur	ae3c83b7dc	Merge pull request #2133 from aspangaro/3.6-patch2 #1725 Missing table cells in services list header	2014-12-08 00:06:54 +01:00
Laurent Destailleur	1e8e7474d8	Fixed: specimen init did not include new vars of 3.7	2014-12-07 21:22:43 +01:00
Laurent Destailleur	1db6d86c78	Fix: versions	2014-12-07 19:10:24 +01:00
Laurent Destailleur	c35018be5f	Fixed: Translations	2014-12-07 18:24:45 +01:00
Laurent Destailleur	455a2fe07a	Fixed: Missing hook init Fixed: Translation at wrong place	2014-12-07 15:14:24 +01:00
Laurent Destailleur	dce4b4acc2	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-12-07 15:13:37 +01:00
Laurent Destailleur	a4a7489a54	Fix: Missing the hook init	2014-12-07 15:12:32 +01:00
Laurent Destailleur	0b766b1f47	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-12-07 12:11:26 +01:00
Laurent Destailleur	ff23b0c0a6	Fix: No print	2014-12-07 12:10:50 +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
Juanjo Menent	0d9aa452b8	Trad: Create es_ES productbatch from transifex	2014-12-06 11:01:15 +01:00
Juanjo Menent	430b2ff8db	Fix: datepicker first day of week can be monday by setting into display setup	2014-12-06 11:00:49 +01:00
Juanjo Menent	dc2bd10cec	Trad: Update es_ES from transifex	2014-12-06 01:25:52 +01:00
Florian HENRY	bd8b393d8a	Fix [ bug #1740 ] Clone project make task date crazy	2014-12-05 21:25:43 +01:00
Florian HENRY	aaf2cca45f	Fix bug n sellist extrafield filtered	2014-12-05 21:25:43 +01:00
Laurent Destailleur	df066c3741	Fix: PHPCS	2014-12-05 20:34:36 +01:00
Laurent Destailleur	c36d362248	Fix: PHPCS 2.0	2014-12-05 17:38:34 +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	bff65fc6b4	Fix: starting with var with always same color	2014-12-05 01:25:18 +01:00
Laurent Destailleur	8d405a147f	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: build/debian/changelog htdocs/core/tpl/objectline_create.tpl.php	2014-12-04 15:29:45 +01:00
Laurent Destailleur	9e1b0d1abc	Prepare 3.5.6	2014-12-04 15:09:47 +01:00
Laurent Destailleur	f6be48f255	Better translation	2014-12-04 14:36:06 +01:00
Laurent Destailleur	9c2485c469	Better explanation	2014-12-04 13:25:20 +01:00
Laurent Destailleur	83122ebe1e	Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now for release.	2014-12-04 13:20:56 +01:00
Laurent Destailleur	ec9c3cc115	Fix: Better translation	2014-12-04 11:53:44 +01:00
Laurent Destailleur	782486bb4c	Fix: Project with no tasks was not visible	2014-12-04 11:14:02 +01:00
Laurent Destailleur	937414e9b1	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-12-04 11:04:11 +01:00
Laurent Destailleur	76bd7dd512	Fixed: A lot of fixed on project views (info on project area). Also add a limit to avoid problem with very large database.	2014-12-04 11:03:48 +01:00
Laurent Destailleur	fe33a2a42e	Better translation	2014-12-04 10:06:41 +01:00
Laurent Destailleur	0bc9ae25f0	Fix: Var not defined	2014-12-04 01:42:23 +01:00
Laurent Destailleur	b5d74372de	Bad var	2014-12-04 01:36:53 +01:00
Laurent Destailleur	3de0702f2b	Fixed: All sql requests are now logged	2014-12-04 01:29:01 +01:00
Laurent Destailleur	c844e35fa1	Fix: Option CASHDESK_SHOW_KEYPAD was not working	2014-12-04 01:26:19 +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
Frédéric FRANCE	79314b7ff8	Fix missing space	2014-12-03 12:47:11 +01:00
Laurent Destailleur	2ddc3cb3f0	Fix: Using a select with checkbox will not be compatible when we will add feature to put box on other pages.	2014-12-03 12:43:14 +01:00
Frédéric FRANCE	58621e7e13	Update boxes.php	2014-12-03 12:32:37 +01:00
Laurent Destailleur	e21d6b0954	Merge pull request #2131 from aspangaro/3.6-patch Untranslatable token Calendar in datepicker	2014-12-03 12:16:55 +01:00
Laurent Destailleur	7afe9de1c0	Start to debug batch/serial module	2014-12-03 00:42:14 +01:00
Laurent Destailleur	c3b74e66ff	Fix: Add constant to hide an obscur feature	2014-12-03 00:22:48 +01:00
Laurent Destailleur	bde5a5d307	Fix: Missing translation of batch-serial prouct module	2014-12-03 00:11:31 +01:00
aspangaro	477aeecdac	#1725 Missing table cells in services list header	2014-12-02 22:30:40 +01:00
aspangaro	5a05d4a4b8	Untranslatable token Calendar in datepicker	2014-12-02 20:59:00 +01:00
aspangaro	f6ab7ca0c9	Typo	2014-12-02 20:42:47 +01:00
Frédéric FRANCE	650d4a3da9	Fix missing /form	2014-12-02 19:55:10 +01:00
Frédéric FRANCE	a8386b48e5	Update index.php	2014-12-02 19:53:54 +01:00
Laurent Destailleur	8291a032d9	Fix: Bad translation	2014-12-02 19:38:55 +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	253fd83aca	Fixed: When invoice is created from subscription, the accountancy code was wrong because product added was a free product using default value for accountancy code. Fix is to choose product into member module page.	2014-12-01 13:26:05 +01:00
Laurent Destailleur	f3584fa211	Fixed: Button at wrong place Fixed: Must use style css span badge for number of files	2014-12-01 00:53:15 +01:00
Laurent Destailleur	cf646b914d	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-11-30 18:57:52 +01:00
Laurent Destailleur	931c1fc671	Sync from transifex	2014-11-30 16:20:58 +01:00
Laurent Destailleur	e395fd8096	Fix CRLF	2014-11-30 15:24:39 +01:00
Laurent Destailleur	d39dbe66c8	Fix: Removed duplicate entrie into language files Renamed tool so all script to run before release start with "fix".	2014-11-30 14:51:57 +01:00
Laurent Destailleur	e2c606f416	Better translation	2014-11-30 14:12:59 +01:00
Laurent Destailleur	20e76aa4e6	Fixed: Use constant to hide a feature that will probably be broken. Also it is a superfluous feature.	2014-11-30 02:05:45 +01:00
Laurent Destailleur	7303983610	Fixed: Ton of old bugs when debugging POS.	2014-11-30 01:35:58 +01:00
Laurent Destailleur	7843ed41f3	Fixed: Bad permission	2014-11-29 20:50:05 +01:00
Laurent Destailleur	def4ab5065	Fixed: Missing picto Fixed: Menu auguria Fixed: Default label	2014-11-29 20:41:09 +01:00
Laurent Destailleur	b9ea7d4d13	Fix: Stock decrease from POS	2014-11-29 17:38:12 +01:00
Laurent Destailleur	1797569a6d	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-11-29 16:44:37 +01:00
Laurent Destailleur	3fe2db6c8d	Try to find a solution to fight against spam sending from dolibarr when phpmail is set. No time to find a better solution so i add just a hidden option to disable phpmail function.	2014-11-29 13:50:41 +01:00
Laurent Destailleur	278cdf72d6	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-11-29 12:41:26 +01:00
Laurent Destailleur	c7420662e6	Fixed: Module for target emailing must not be visible when modules is disabled.	2014-11-29 12:40:45 +01:00
Laurent Destailleur	e118d9af22	Fixed: Protection to lock language setup in demo mode was not working	2014-11-29 12:11:12 +01:00
Laurent Destailleur	cdd256e206	Add info to help understand debug	2014-11-29 12:00:42 +01:00
Laurent Destailleur	7f0a01936e	Fix a very old bug of conflicth into decrease stock when using point of sale, not compatible with option defined into stock module.	2014-11-28 20:41:52 +01:00
Laurent Destailleur	d3b32ce22f	Fixed: Bad function/picto for information messages (not a star)	2014-11-28 19:49:42 +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
Raphaël Doursenaud	953fe6b1f2	CRLF fix	2014-11-28 15:58:23 +01:00
Laurent Destailleur	df9a6dae6c	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php htdocs/core/tpl/objectline_create.tpl.php htdocs/fichinter/fiche.php	2014-11-28 02:20:01 +01:00
Laurent Destailleur	a81c483061	Revert "Update objectline_create.tpl.php" This reverts commit `fdac53bfca`.	2014-11-28 02:14:25 +01:00
Laurent Destailleur	9ba5e9434d	Fix: W3C a label must be used if there is an "input" field only. Also it is recommanded to have the input inside the label tags, not outside. This solve bugs on some smatphone browsers.	2014-11-28 02:05:40 +01:00
Marcos García de La Fuente	1c16a2e621	Fixed [ bug #1642 ]: add a free line in contract	2014-11-28 01:15:45 +01:00
Laurent Destailleur	79c8980493	Fix: function at wrong place	2014-11-28 01:13:57 +01:00
Marcos García de La Fuente	5cc015268e	Fixed [ bug #1718 ] Mistakenly searching for text in amount field breaks	2014-11-28 01:02:59 +01:00
Marcos García de La Fuente	0a0e0e068c	Fixed [ bug #1691 ] Don't think the ID should be displayed in holiday module	2014-11-28 01:02:44 +01:00
Laurent Destailleur	38062177d3	Doxygen	2014-11-28 00:37:46 +01:00
Laurent Destailleur	232921a506	Fixed: Add option on a not common new feature	2014-11-28 00:34:03 +01:00
Laurent Destailleur	dc1c98734e	Fixed: Option specific to a module should start with module name	2014-11-28 00:21:52 +01:00
Laurent Destailleur	f9953d52f6	Merge pull request #2091 from frederic34/patch-3 Fix 1721 Missing translation on proposal creation	2014-11-28 00:16:44 +01:00
Laurent Destailleur	ae6f458a98	Merge pull request #2092 from frederic34/patch-2 Fix Typo	2014-11-28 00:12:11 +01:00
Laurent Destailleur	02d53aa26f	Merge pull request #2093 from frederic34/patch-4 Fix Typo	2014-11-28 00:11:49 +01:00
Laurent Destailleur	b21171303a	Merge pull request #2094 from frederic34/patch-5 Fix Typo	2014-11-28 00:11:23 +01:00
Laurent Destailleur	631a98c322	Merge pull request #2095 from frederic34/patch-6 Fix Typo	2014-11-28 00:10:48 +01:00
Laurent Destailleur	61889d2195	Merge pull request #2096 from frederic34/patch-7 Fix Typo	2014-11-28 00:10:24 +01:00
Laurent Destailleur	db5fb1ad9e	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-11-28 00:05:02 +01:00
Laurent Destailleur	6843bfcc15	Fix typo	2014-11-28 00:01:59 +01:00
Laurent Destailleur	3af6e048e5	Merge pull request #2101 from frederic34/patch-8 Fix remove </a> not needed	2014-11-27 23:59:05 +01:00
Laurent Destailleur	f36a30f9fe	Fixed: W3C. An id must be unique inside a page.	2014-11-27 23:25:29 +01:00
Frédéric FRANCE	5a97ee1f95	Rearrange Help Block in left menu	2014-11-27 23:20:13 +01:00
Laurent Destailleur	8d33a6947b	Merge pull request #2105 from frederic34/patch-11 Fix 1733 Homepage boxes close button translation error	2014-11-27 21:51:00 +01:00
Laurent Destailleur	8a8f9aaee3	Merge pull request #2106 from frederic34/patch-12 Fix 1655 Proposal amount not computed in preview	2014-11-27 21:49:43 +01:00
Frédéric FRANCE	f769295999	Update apercu.php	2014-11-27 21:03:01 +01:00
jfefe	1b35c5e77b	Missing extrafields management for order webservice	2014-11-27 12:56:10 +01:00
Frédéric FRANCE	e179e7d5a5	Fix 1655 Proposal amount not computed in preview	2014-11-26 17:24:26 +01:00
Frédéric FRANCE	90b582b1f3	Fix 1733 Homepage boxes close button translation error In french : Close -> Clotûrer (Close a propal) Close2 ->Fermer (Close a window)	2014-11-26 16:58:54 +01:00
Francis Appels	b1a4b8e7d0	Fix: [ bug #1624 ] POS set buy price for margin Use lowest buying price for margin when selling with POS or external module. A POS user does not worry about suppliers.	2014-11-25 21:20:13 +01:00
Frédéric FRANCE	fbdd851875	Fix remove </a> not needed	2014-11-25 18:54:56 +01:00
Francis Appels	18406fc550	Fix: Show sender Country on PDF docs Show sender Country on PDF docs when sender Country != receiver Country	2014-11-25 14:26:45 +01:00
Frédéric FRANCE	911f9c0913	Fix Typo	2014-11-25 01:13:52 +01:00
Frédéric FRANCE	e4517ee0f4	Fix Typo	2014-11-25 01:07:45 +01:00
Frédéric FRANCE	9fb58e06f6	Fix Typo	2014-11-25 01:06:55 +01:00
Frédéric FRANCE	6163635d7c	Fix Typo	2014-11-25 01:06:04 +01:00
Frédéric FRANCE	9d813b25d9	Fix Typo	2014-11-25 01:05:01 +01:00
Frédéric FRANCE	f5bc6dc634	Update propal.php	2014-11-24 21:01:55 +01:00
Frédéric FRANCE	81f467661e	Update propal.php	2014-11-24 20:58:46 +01:00
Frédéric FRANCE	655dc35628	Update propal.php	2014-11-24 20:57:26 +01:00
Frédéric FRANCE	5dbba380d2	Fix 1721 Missing translation on proposal creation	2014-11-24 20:54:38 +01:00
Laurent Destailleur	ab25b149c5	Fix: Download of user files	2014-11-24 15:40:40 +01:00
Laurent Destailleur	1dbb19e8ef	Merge pull request #2058 from defrance69/patch-30 Update objectline_create.tpl.php	2014-11-24 10:57:14 +01:00
Laurent Destailleur	bc1d88d324	Fixed: The visualization of status with mutualized picto was lost, so i restore old feature to keep same visual for all status and add hidden option to switch to new.	2014-11-24 01:16:26 +01:00
Laurent Destailleur	29bfe7050d	Fix: W3C.	2014-11-24 01:11:30 +01:00
Marcos García de La Fuente	3ab8cff641	Removed unused action of card.php	2014-11-24 01:09:11 +01:00
Marcos García de La Fuente	6304895d75	Fixed typo	2014-11-24 01:05:18 +01:00
Marcos García de La Fuente	601710a4dc	Highlight of required fields should be only in edit mode Conflicts: htdocs/bookmarks/card.php	2014-11-24 01:05:01 +01:00
Marcos García de La Fuente	6159591a02	Fixed [ bug #1679 ] Can't sort groups by user count in user groups list	2014-11-24 01:01:33 +01:00
Laurent Destailleur	00031cbdab	Merge pull request #2085 from frederic34/patch-2 Put label into div	2014-11-24 00:59:38 +01:00
Laurent Destailleur	ca1a21012e	Merge pull request #2086 from aspangaro/3.7-patch1 Patch module resource	2014-11-24 00:58:41 +01:00
Laurent Destailleur	891e39189a	Fixed: missing css class	2014-11-23 23:31:35 +01:00
Laurent Destailleur	7a18240d2f	Doxygen	2014-11-23 23:22:49 +01:00
aspangaro	aa8c165f06	Presentation	2014-11-23 21:03:34 +01:00
Frédéric FRANCE	6cc79c2dd7	Put label into div	2014-11-23 18:42:48 +01:00
Laurent Destailleur	6d2e024d52	Doxygen	2014-11-23 17:53:44 +01:00
Laurent Destailleur	e3710bb61a	Merge pull request #2084 from frederic34/patch-3 Fix Typo	2014-11-23 17:47:55 +01:00
Laurent Destailleur	3f655154c5	Merge pull request #2083 from frederic34/patch-2 Fix Typo	2014-11-23 17:47:43 +01:00
Frédéric FRANCE	979d6dffa2	Update /compta/paiement/cheque/list.php	2014-11-23 17:45:18 +01:00
Frédéric FRANCE	ba7500a504	Update /fourn/facture/impayees.php	2014-11-23 17:45:14 +01:00
Frédéric FRANCE	0384f90607	Update /fourn/facture/paiement.php	2014-11-23 17:45:11 +01:00
Frédéric FRANCE	afc87f5445	Update /fourn/commande/list.php	2014-11-23 17:45:07 +01:00
Frédéric FRANCE	99e88c16c4	Update /product/stock/mouvement.php	2014-11-23 17:45:04 +01:00
Frédéric FRANCE	01e6d9fc12	Update /comm/prospect/list.php	2014-11-23 17:45:00 +01:00
Frédéric FRANCE	627e3e0a2b	Update /comm/actions/listactions.php	2014-11-23 17:44:57 +01:00
Frédéric FRANCE	199239ac8b	Update /accountancy/bookeeping/list.php	2014-11-23 17:44:53 +01:00
Frédéric FRANCE	b6824877e5	Update /accountancy/admin/account.php	2014-11-23 17:44:49 +01:00
Frédéric FRANCE	339415034e	Update /compta/facture/impayees.php	2014-11-23 17:44:45 +01:00
Frédéric FRANCE	ccff0f0952	Update /compta/facture/list.php	2014-11-23 17:44:41 +01:00
Frédéric FRANCE	9b731753e7	Update /compta/salaries/index.php	2014-11-23 17:44:37 +01:00
Frédéric FRANCE	fa89e310ae	Update /compta/paiement/list.php	2014-11-23 17:44:33 +01:00
Frédéric FRANCE	dd1c39b44e	Update /compta/bank/search.php	2014-11-23 17:44:29 +01:00
Frédéric FRANCE	2a79c2c826	Update /compta/sociales/index.php	2014-11-23 17:44:25 +01:00
Frédéric FRANCE	59494db8c1	Update /compta/tva/reglement.php	2014-11-23 17:44:21 +01:00
Frédéric FRANCE	8c839cc2a1	Update /compta/prelevement/list.php	2014-11-23 17:44:16 +01:00
Frédéric FRANCE	68ccb33def	Update /compta/deplacement/list.php	2014-11-23 17:44:13 +01:00
Frédéric FRANCE	045c2f9568	Update /compta/dons/list.php	2014-11-23 17:44:08 +01:00
Frédéric FRANCE	64497de4d8	Update /societe/societe.php	2014-11-23 17:44:04 +01:00
Frédéric FRANCE	62876cc022	Update /societe/consumption.php	2014-11-23 17:44:01 +01:00
Frédéric FRANCE	e7f9b9bf1b	Update /adherents/list.php	2014-11-23 17:43:57 +01:00
Frédéric FRANCE	f6db1d5da2	Update /fourn/list.php	2014-11-23 17:43:52 +01:00
Frédéric FRANCE	d57344a2e7	Update /contrat/list.php	2014-11-23 17:43:48 +01:00
Frédéric FRANCE	c97e95f6ab	Update /contrat/services.php	2014-11-23 17:43:44 +01:00
Frédéric FRANCE	84d3bd2b43	Update /expedition/list.php	2014-11-23 17:43:40 +01:00
Frédéric FRANCE	b396ccaf73	Update /fichinter/list.php	2014-11-23 17:43:36 +01:00
Frédéric FRANCE	e6da4a2518	Update /comm/list.php	2014-11-23 17:43:32 +01:00
Frédéric FRANCE	baaadd772e	Update /holiday/index.php	2014-11-23 17:43:28 +01:00
Frédéric FRANCE	28e620a7bf	Update /cron/list.php	2014-11-23 17:43:24 +01:00
Frédéric FRANCE	d17b5268fa	(GETPOST("button_removefilter_x") \|\| GETPOST("button_removefilter")) if (GETPOST("button_removefilter_x") \|\| GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers	2014-11-23 17:43:19 +01:00
Frédéric FRANCE	486d24b8db	Fix Typo	2014-11-23 17:43:06 +01:00
Frédéric FRANCE	326e009cad	Fix Typo	2014-11-23 17:42:06 +01:00
Laurent Destailleur	652b0f84a7	Fixed: Field is used only by module accounting so must have a condition on it.	2014-11-23 17:03:22 +01:00
Marcos García de La Fuente	1347a16fd3	Fixed[ bug #1661 ] Bookmarks list "Target" translation missing	2014-11-23 16:55:40 +01:00
Marcos García de La Fuente	a927a04421	Fixed [ bug #1705 ] Members statistics menu entry strange target	2014-11-23 16:55:32 +01:00
Marcos García de La Fuente	5578bc6f5d	Fixed [ bug #1658 ] Linked files in supplier invoices wrongly shows amounts	2014-11-23 16:55:12 +01:00
Laurent Destailleur	375d9aa336	Merge pull request #2077 from marcosgdf/3.6 Fixed [ bug #1595 ] Selected boolean extrafield in intervention creation page, does not save state	2014-11-23 16:53:07 +01:00
Laurent Destailleur	1635f725c8	Merge remote-tracking branch 'origin/3.6' into 3.7	2014-11-23 16:51:25 +01:00
Laurent Destailleur	1f986014f1	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-11-23 16:50:08 +01:00
Laurent Destailleur	7678f9b13c	Merge pull request #2069 from frederic34/patch-4 Fix 1662 Search filter display discrepancy	2014-11-23 16:48:59 +01:00
Laurent Destailleur	becbf9eada	Merge pull request #2068 from frederic34/patch-3 Fix 1667 Pagination is only partially shown in supplier references list	2014-11-23 16:48:44 +01:00
Laurent Destailleur	bd8391163a	Merge pull request #2067 from frederic34/patch-2 Fix bug 1692 Can't update phone_pro with the contact webservice	2014-11-23 16:48:33 +01:00
Laurent Destailleur	989cd87446	Merge pull request #2066 from altatof/fix_margin_recap FIX: bad margin and buy_price calculation when total_ht = 0 (discount 100%) on a line	2014-11-23 16:48:21 +01:00
Marcos García de La Fuente	eb569fe235	Fixed [ bug #1712 ] Unable to add a social charge	2014-11-23 16:43:52 +01:00
Marcos García de La Fuente	dcfaeb6606	Merge remote-tracking branch 'upstream/3.6' into 3.6	2014-11-23 16:04:23 +01:00
Marcos García de La Fuente	7a272afd12	Fixed [ bug #1595 ] Selected boolean extrafield in intervention creation page, does not save state	2014-11-23 16:03:49 +01:00
Laurent Destailleur	1c1e2ed246	Better comment	2014-11-23 13:19:28 +01:00
Laurent Destailleur	3aef9d928b	Fix: W3C	2014-11-23 13:14:03 +01:00
Laurent Destailleur	97a6bd842d	Minor fixes.	2014-11-23 12:39:53 +01:00
Frédéric FRANCE	ffd435d9ff	Fix 1662 Search filter display discrepancy	2014-11-23 01:20:02 +01:00
Frédéric FRANCE	b2a1408d8e	Fix 1667 Pagination is only partially shown in supplier references list	2014-11-23 00:51:13 +01:00
Frédéric FRANCE	891f8d9442	Fix bug 1692 Can't update phone_pro with the contact webservice	2014-11-22 19:02:15 +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	d8767bfbae	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/core/class/commonobject.class.php htdocs/product/class/product.class.php	2014-11-22 16:10:14 +01:00
Laurent Destailleur	9aab62ab36	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-11-22 16:03:09 +01:00
Laurent Destailleur	2f4de2ef75	Merge pull request #2016 from altatof/3.5 FIX: copy extrafields when creating order from propale and creating	2014-11-22 16:02:13 +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
Andrelec1	667f1bf497	Fix : more than 1000 holidays Si il y a plus de 1000 jours de congés, le délimiteur des millier fais bugger les calcule ...	2014-11-22 15:59:51 +01:00
Laurent Destailleur	e8b2206629	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-11-22 15:57:33 +01:00
Laurent Destailleur	86a3a4f618	Merge branch '1680' of github.com:aspangaro/dolibarr into aspangaro-1680 Conflicts: htdocs/comm/propal/list.php	2014-11-22 15:57:06 +01:00
Laurent Destailleur	e6e5cb471d	Merge pull request #2040 from aspangaro/1681 #1681 Clear sort filter works partially in customers list	2014-11-22 15:54:57 +01:00
Laurent Destailleur	432b623dac	Merge pull request #2041 from aspangaro/1684 #1684 Clear sort filter works partially in interventions list	2014-11-22 15:54:38 +01:00
Laurent Destailleur	34306359a4	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-11-22 15:54:14 +01:00
Laurent Destailleur	9ddb76ca12	Merge pull request #2042 from frederic34/patch-9 #1664 Can't sort by mobile phones in contact list	2014-11-22 15:53:55 +01:00
Laurent Destailleur	d3e216c19a	Clear compatible with all browsers	2014-11-22 15:53:37 +01:00
Laurent Destailleur	0e44e05600	Merge pull request #2043 from frederic34/patch-2 #1665 Can't clear sort filter on contacts list	2014-11-22 15:52:36 +01:00
Laurent Destailleur	d7b0aab71a	Clear works with all browsers	2014-11-22 15:52:08 +01:00
Laurent Destailleur	a7df54ef0d	Merge pull request #2044 from frederic34/patch-3 #1666 Clear sort filter works partially in product/services	2014-11-22 15:51:07 +01:00
Laurent Destailleur	6c7bab8d8c	Merge pull request #2045 from frederic34/patch-4 #1682 Date is missing in proposals list	2014-11-22 15:50:50 +01:00
Laurent Destailleur	86f2f191ea	Merge pull request #2046 from frederic34/patch-5 #1683 Can't clear sort filter on proposals list	2014-11-22 15:50:37 +01:00
Laurent Destailleur	e4804f99ff	Merge pull request #2047 from frederic34/patch-6 #1685-1686 Clear sort filter works partially in supplier invoices	2014-11-22 15:50:16 +01:00
Laurent Destailleur	830d470c33	Merge pull request #2047 from frederic34/patch-6 #1685-1686 Clear sort filter works partially in supplier invoices	2014-11-22 15:48:28 +01:00
Laurent Destailleur	d6cb29a17b	Merge pull request #2048 from frederic34/patch-7 #1689 Can't sort supplier invoice payments on amounts	2014-11-22 15:47:55 +01:00
Laurent Destailleur	8c440dea4a	Fxied: Syntax error	2014-11-22 15:47:14 +01:00
Laurent Destailleur	a6867fef0f	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-11-22 15:46:07 +01:00
Laurent Destailleur	b9cf6ddd65	Merge branch '1698' of github.com:aspangaro/dolibarr into aspangaro-1698 Conflicts: htdocs/langs/en_US/donations.lang	2014-11-22 15:44:59 +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	7fbeb2cbcb	Merge pull request #2053 from aspangaro/1688 #1688 The ref filter searches on rowid not on ref in unpaid supplier inv...	2014-11-22 15:41:39 +01:00
BENKE Charles	730bf1c25c	Update html.formcontract.class.php bad filtering on contract list (same sql rule as project)	2014-11-22 15:41:18 +01:00
Laurent Destailleur	a47c7f02e2	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-11-22 15:37:34 +01:00
Laurent Destailleur	eaa4b6cb56	Add PR manually because of conflict "#1678 & #1677 Untranslatable token"	2014-11-22 15:37:18 +01:00
Laurent Destailleur	f0d32e3b65	Merge pull request #2059 from aspangaro/1657 #1657 Intervention preview date is not displayed	2014-11-22 15:33:49 +01:00
Laurent Destailleur	135e58871e	Merge pull request #2061 from aspangaro/1704 #1704 Untranslatable token in externalsite module admin	2014-11-22 15:33:18 +01:00
Laurent Destailleur	4b2e0b555a	Merge pull request #2062 from aspangaro/1706 #1706 Missing table cell in shipment list header + Search fields doesn't...	2014-11-22 15:31:41 +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
Laurent Destailleur	43f3e28fd6	Fixed: [ bug #1645 ] Can't list contracts	2014-11-22 15:12:36 +01:00
Laurent Destailleur	d6f47227fe	Fixed: [ bug #1646 ] Can't list unpaid invoices	2014-11-22 15:09:54 +01:00
Laurent Destailleur	a2d4046f50	Fixed: Untranslatable tokens	2014-11-22 00:45:04 +01:00
Laurent Destailleur	068c7fdb2d	Fixed: [ bug #1635 ] le tiers n'apparait plus sur la fiche tache	2014-11-22 00:31:19 +01:00
Laurent Destailleur	95d7dc4841	Fixed: [ bug #1565 ] Customer order label for status 2 is not coherent in french	2014-11-22 00:08:06 +01:00
Laurent Destailleur	5acdce0b9f	Fixed: [ bug #1647 ] Can't list tax payments	2014-11-21 23:52:12 +01:00
Laurent Destailleur	6bc3dd67a8	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-11-21 23:47:24 +01:00
Laurent Destailleur	ce98036725	Fixed: [ bug #1648 ] Can't see turnover report by product/services	2014-11-21 23:45:56 +01:00
Laurent Destailleur	dba27f4a39	Merge pull request #2057 from frederic34/patch-10 #1650 Can't display supplier products in it's card	2014-11-21 23:40:38 +01:00
Laurent Destailleur	32f4db259c	Fix: [ bug #1651 ] Can't display margins in thirdparty card	2014-11-21 23:39:02 +01:00
Laurent Destailleur	b644075faa	Fix: doxygen	2014-11-20 23:41:58 +01:00
Laurent Destailleur	f7a74a9ac9	Fix: CRLF	2014-11-20 16:16:15 +01:00
Laurent Destailleur	8bf402593a	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-11-20 15:39:50 +01:00
Laurent Destailleur	95de38e102	Start to fix [ bug #1711 ] Projet cloturé toujours visible dans les autres module pour affectation but it is a too important change.	2014-11-20 15:32:10 +01:00
Laurent Destailleur	0f5203b384	Edit vat	2014-11-20 15:08:13 +01:00
Laurent Destailleur	8ffae31175	Merge pull request #2055 from frederic34/patch-8 #1695 SQL error on task creation	2014-11-20 14:47:45 +01:00
Laurent Destailleur	d462facf6d	Fixed: [ bug #1653 ] Can't access task notes	2014-11-20 14:44:49 +01:00
Laurent Destailleur	ea02bdf85e	Fix: duplicate function	2014-11-20 13:06:05 +01:00
Laurent Destailleur	76b8ff9416	Fix: css	2014-11-20 11:34:43 +01:00
Laurent Destailleur	2264009247	Fix: css	2014-11-20 11:24:06 +01:00
Laurent Destailleur	9f6a6d1300	Fix: Missing translation	2014-11-20 10:55:38 +01:00
Laurent Destailleur	c8cd36f3e6	Fixed: ref supplier was visible with label Ref customer.	2014-11-20 10:48:55 +01:00
Laurent Destailleur	d94d7f683b	Try to solve warning.	2014-11-20 10:31:59 +01:00
Laurent Destailleur	358ddb0abc	Fix: W3C. form into table is forbidden. This makes some browsers crazy.	2014-11-20 10:15:24 +01:00
aspangaro	4b229dabfd	#1706 Missing table cell in shipment list header + Search fields doesn't work	2014-11-20 06:55:38 +01:00
aspangaro	01a5f22f4a	#1704 Untranslatable token in externalsite module admin	2014-11-20 06:34:50 +01:00
aspangaro	0ec30ea8c0	Merge remote-tracking branch 'Upstream/3.7' into 1657	2014-11-20 06:03:50 +01:00
aspangaro	4d48205e45	#1657 Intervention preview date is not displayed	2014-11-20 06:01:08 +01:00
Laurent Destailleur	179834c663	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-11-19 23:10:49 +01:00
Laurent Destailleur	f7206c2a52	Fixed: [ bug #1578 ] Cannot create proposal by copy of another one	2014-11-19 23:10:30 +01:00
BENKE Charles	fdac53bfca	Update objectline_create.tpl.php add label tags for product mode type	2014-11-19 18:53:33 +01:00
Christophe Battarel	7d8cf99d58	FIX: bad margin and buy_price calculation when total_ht = 0 (discount 100%) on a line	2014-11-19 18:19:27 +01:00
Frédéric FRANCE	93ed5875d3	#1650 Can't display supplier products in it's card I think error is in sql request for last supplier invoice list because there is no sql request in supplier products To avoid error in mysql strict mode sql-mode="STRICT_ALL_TABLES,ONLY_FULL_GROUP_BY,NO_ZERO_DATE"	2014-11-19 15:50:18 +01:00
Juanjo Menent	9e28452379	Fix: remove duplicate code	2014-11-19 10:02:01 +01:00
Juanjo Menent	3dacdf4e4a	Fix: Conflicts and remove duplicate code	2014-11-19 09:41:21 +01:00
Laurent Destailleur	84729a6aa3	Fix: Bad vars	2014-11-18 23:18:59 +01:00
Frédéric FRANCE	3dea1fd68f	#1695 SQL error on task creation	2014-11-18 22:53:39 +01:00
aspangaro	e3edc3f690	#1688 The ref filter searches on rowid not on ref in unpaid supplier invoices list	2014-11-18 21:55:41 +01:00
aspangaro	621f2b5c77	#1672 VAT accounts by default are lost in migration	2014-11-18 21:28:12 +01:00
aspangaro	1b077950cd	#1698 Untranslatable strings in donation module admin	2014-11-18 19:54:48 +01:00
Laurent Destailleur	8b0a9d78bb	Fix: CRLF	2014-11-18 19:03:02 +01:00
Laurent Destailleur	80e62697f0	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/compta/bank/treso.php	2014-11-18 19:01:01 +01:00
Laurent Destailleur	1b24356e0f	ssl option is set to CURL_SSLVERSION_TLSv1. Some site disabled ssl v1 to 3 (ex: paypal).	2014-11-18 17:13:08 +01:00
Laurent Destailleur	c8fe538de2	Fix: Filter were lost	2014-11-18 14:37:19 +01:00
Laurent Destailleur	c077998ff8	Fix: Line not visible when there is a lot of lines.	2014-11-18 14:37:14 +01:00
Frédéric FRANCE	cd3bafbef7	Update list.php	2014-11-18 00:27:53 +01:00
Frédéric FRANCE	e9966c50da	#1689 Can't sort supplier invoice payments on amounts	2014-11-18 00:04:45 +01:00
Frédéric FRANCE	d8192d8223	#1685-1686 Clear sort filter works partially in supplier invoices	2014-11-18 00:02:53 +01:00
Frédéric FRANCE	5536abecf7	#1683 Can't clear sort filter on proposals list	2014-11-17 23:57:01 +01:00
Frédéric FRANCE	f2eda0629b	#1682 Date is missing in proposals list	2014-11-17 23:54:39 +01:00
Frédéric FRANCE	167cf258e7	#1666 Clear sort filter works partially in product/services	2014-11-17 23:53:01 +01:00
Frédéric FRANCE	db99b7f09a	#1665 Can't clear sort filter on contacts list	2014-11-17 23:49:39 +01:00
Frédéric FRANCE	264794ec8c	#1664 Can't sort by mobile phones in contact list	2014-11-17 23:46:30 +01:00
aspangaro	de7a38417f	#1680 Clear sort filter works partially in prospects list	2014-11-17 21:45:29 +01:00
aspangaro	86e624c3bc	#1684 Clear sort filter works partially in interventions list	2014-11-17 21:31:18 +01:00
aspangaro	a82953ef70	#1681 Clear sort filter works partially in customers list	2014-11-17 21:18:26 +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
Christophe Battarel	d0dc792b3c	check extrafields before inserting in DB	2014-11-17 11:17:45 +01:00
Laurent Destailleur	05059da9e8	Fix: [ bug #1631 ] technical error in the display of associated objects / erreur technique à l'affichage des objets associés à un projet	2014-11-17 01:06:30 +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	737dfab5b2	Fix: If error on add line of type "product" when creating proposal/order/invoice, do not show date of services.	2014-11-16 19:12:05 +01:00
Laurent Destailleur	8d4fc263c5	Fix: Var not defined	2014-11-16 18:37:09 +01:00
Laurent Destailleur	01279edfc8	Fixed: [ bug #1570 ] Negative supplier invoices do not appear in bank planned transactions.	2014-11-16 16:36:32 +01:00
Laurent Destailleur	10117d045f	Fixed #1637	2014-11-16 16:15:31 +01:00
Laurent Destailleur	e3a8041b0d	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/compta/facture.php htdocs/user/fiche.php	2014-11-16 15:46:08 +01:00
Laurent Destailleur	64a2cce7c0	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-11-16 14:11:19 +01:00
Laurent Destailleur	d4ad7236e5	Clean old code for multiselect (replaced with select2 plugin).	2014-11-16 00:46:27 +01:00
Laurent Destailleur	81e203eef1	Fix: Ref was not visible.	2014-11-15 20:48:39 +01:00
Laurent Destailleur	c186f13218	Fix: Param $action was not defined. A better fix must be done later be removing useless hooks that are duplicate with triggers.	2014-11-15 19:04:21 +01:00
Laurent Destailleur	539a201d3e	Fix: doxygen	2014-11-15 18:30:37 +01:00
Laurent Destailleur	445f696d28	Fix: Pb of object with wrong type.	2014-11-15 18:24:38 +01:00
Laurent Destailleur	741adc79b2	Fix: Bugs reported by scrutinizer	2014-11-15 17:05:43 +01:00
Laurent Destailleur	ad661256c0	Fix: Bugs reported by scrutinizer	2014-11-15 16:20:03 +01:00
Laurent Destailleur	d98bfb1d8d	Fix: Bugs reported by scrutinizer	2014-11-15 15:19:37 +01:00
Laurent Destailleur	d0fb732cce	Fix: Bad value for ThousandSeparator.	2014-11-15 14:24:10 +01:00
Laurent Destailleur	683cdaf881	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-11-15 14:15:15 +01:00
Laurent Destailleur	11eb7de596	Try to clean sql to avoid mysql bug	2014-11-15 14:14:52 +01:00
Laurent Destailleur	2aeb0f4f5b	Merge pull request #1941 from jfefe/patch-3 Avoid missing class error for fetch_thirdparty method	2014-11-15 12:36:41 +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
Laurent Destailleur	eb41fc2765	Merge pull request #2018 from daamien/develop Remove full descriptions from the product list in the contract card	2014-11-15 12:08:50 +01:00
Laurent Destailleur	962c4b9c32	Merge pull request #2019 from defrance69/patch-27 Patch 27	2014-11-15 12:07:05 +01:00
Laurent Destailleur	7faedf0c69	Uniformize code for search	2014-11-15 11:59:02 +01:00
Laurent Destailleur	e53157b28b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-11-15 00:57:50 +01:00
Laurent Destailleur	a46a6cccaf	Fix: Screen page tests. Page tests are now ok with 3.7.	2014-11-15 00:57:31 +01:00
Laurent Destailleur	a3ab22e27d	Fix: css	2014-11-15 00:16:59 +01:00
Florian HENRY	00c6033e11	Fix display user signature when WYSIWYG is enabled	2014-11-14 13:28:49 +01:00
Laurent Destailleur	425a853e07	- New: Match other auth system: Login can be done entering login or user email (this open the road for SSO).	2014-11-14 11:56:05 +01:00
damien clochard	8dba0f9c85	Check PRODUIT_DESC_IN_FORM before printing the products desc	2014-11-14 00:21:39 +01:00
Laurent Destailleur	6bac744709	Fix: Missing event management into select when combo not selected	2014-11-13 16:46:40 +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
Florian HENRY	c0a3606a59	Fix problem on task creation with chrome for french browser.	2014-11-12 22:53:23 +01:00
Christophe Battarel	7ed496d7d9	FIX: copy extrafields when creating order from propale and creating invoice from order	2014-11-12 17:51:26 +01:00
Laurent Destailleur	d164b2d0e1	Fix: Showing capital	2014-11-12 10:37:39 +01:00
Laurent Destailleur	608fa5eaed	Fix: Avoid to load language when we can not.	2014-11-12 10:25:56 +01:00
Laurent Destailleur	81f0d953e3	Fix: Bad test	2014-11-12 10:05:40 +01:00
aspangaro	da258cd4b0	Typo & presentation	2014-11-12 07:29:57 +01:00
Laurent Destailleur	137b3f898d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-11-12 00:02:30 +01:00
Laurent Destailleur	6eabad65b7	Fix: Removed warning	2014-11-11 23:56:03 +01:00
Laurent Destailleur	47ebe21f7b	Fix: Removed unused property	2014-11-11 23:38:56 +01:00
Laurent Destailleur	7177c04378	Minor css enhancement	2014-11-11 20:45:30 +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
BadPixxel	8fc5faf4a8	Minor BugFix : Missing delete Category Multilangual fields Delete of Multilangual fields was missing, impossible to delete category. Fixed Error : Cannot delete or update a parent row: a foreign key constraint fails (`Dol-3.6`.`llx_categorie_lang`, CONSTRAINT `fk_category_lang_fk_category` FOREIGN KEY (`fk_category`) REFERENCES `llx_categorie` (`rowid`))	2014-11-10 16:29:05 +01:00
Laurent Destailleur	50f690787b	Sync transifex	2014-11-09 19:16:41 +01:00
Laurent Destailleur	29298c73b9	Fix: Must show limit into list	2014-11-09 19:16:22 +01:00
Laurent Destailleur	6fd89c4b41	Fix: Missing translation	2014-11-08 20:05:56 +01:00
Laurent Destailleur	8cb1818c4e	Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6	2014-11-08 14:59:02 +01:00
Laurent Destailleur	92cdef71e8	Fix: Graph report rubbish information. Better to have them as option.	2014-11-08 14:58:43 +01:00
Laurent Destailleur	1dcca6e553	Avoid error	2014-11-08 00:49:52 +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
Laurent Destailleur	429cae5d2e	Recherche bug travis	2014-11-07 23:58:30 +01:00
Laurent Destailleur	6762b98c00	Minor look enhancement during debug	2014-11-07 23:25:39 +01:00
Laurent Destailleur	4c1b1408ed	Fix: Removed duplicate menu entry	2014-11-07 23:15:02 +01:00
Laurent Destailleur	e3f4db85af	Fix divers	2014-11-07 23:07:15 +01:00
Laurent Destailleur	8a89997c79	Fix: bug into edition of extrafields	2014-11-07 22:40:13 +01:00
Laurent Destailleur	83d441f8ff	Show field alwayseditable	2014-11-07 22:24:52 +01:00
Laurent Destailleur	3d5a45e274	Fix: textarea too small	2014-11-07 22:19:31 +01:00
Laurent Destailleur	0b70d26275	Keep commented code to keep a chance for old php version to work.	2014-11-07 22:06:51 +01:00
Laurent Destailleur	0559e29c92	Prepare freeze	2014-11-07 21:52:50 +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
Laurent Destailleur	5cb6b11878	Merge pull request #2007 from aspangaro/develop-search Improvement into list & presentation/typo	2014-11-07 21:47:37 +01:00
Laurent Destailleur	9e92b469b9	Merge pull request #2005 from altairis-fr/hidemargininfos 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-07 21:47:06 +01:00
Laurent Destailleur	5ad6b69ce9	Merge pull request #2006 from frederic34/patch-1 Update antispamimage.php	2014-11-07 21:45:08 +01:00
Drosis Nikos	24439eb1a3	Fix : tva not coming from multiprice	2014-11-07 15:31:06 +02:00
Juanjo Menent	3880013940	Fix hooks from supplierorder to supplierinvoice	2014-11-06 23:10:21 +01:00
Juanjo Menent	2f30e769f6	Fix: [ bug #1535 ] Supplier invoice Extrafields are not shown	2014-11-06 22:16:27 +01:00
aspangaro	64a9c2dba0	Merge remote-tracking branch 'Upstream/develop' into develop-search	2014-11-06 20:06:08 +01:00
aspangaro	acbbe823e8	Typo	2014-11-06 20:04:51 +01:00
aspangaro	a8b3153f54	Improve search in list	2014-11-06 19:47:27 +01:00
Juanjo Menent	e421741fc4	Trad: More accurate trad of holidays. Update form transifex	2014-11-06 17:33:05 +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	0f22ebb7b5	Trad: More accurate trad es_ES of after order. Update form transifex	2014-11-06 12:26:15 +01:00
Juanjo Menent	c422024cb9	Trad: More accurate trad of notifications. Update form transifex	2014-11-06 11:55:26 +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
aspangaro	b60f834d8d	Improve search into supplier command list	2014-11-06 07:19:16 +01:00
aspangaro	4c95cab35f	Improve search in customer command list	2014-11-06 07:13:03 +01:00
aspangaro	16126891a6	Merge remote-tracking branch 'Upstream/develop' into develop-search	2014-11-06 06:41:09 +01:00
aspangaro	b47e899e57	Merge remote-tracking branch 'origin/develop-patch' into develop-search	2014-11-06 06:40:50 +01:00
Laurent Destailleur	0ae1bfab04	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-11-06 00:58:43 +01:00
Juanjo Menent	eadb10e71e	Trad: update es_ES from transifex	2014-11-05 22:31:23 +01:00
aspangaro	89296e3011	Typo search list	2014-11-05 22:27:26 +01:00
Frédéric FRANCE	4cb3dc4238	Update antispamimage.php If imagecreate fail, we can't see error message	2014-11-05 20:02:58 +01:00
Laurent Destailleur	cc1b14e9f8	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-11-05 17:42:11 +01:00
Laurent Destailleur	b601afc92b	Merge pull request #1994 from aspangaro/develop-patch Update module accounting	2014-11-05 17:40:51 +01:00
Laurent Destailleur	e052010941	Merge pull request #2004 from Devensys/Develop-FixErrorFormOther fix error FormOther in user/card.php	2014-11-05 17:39:29 +01:00
Laurent Destailleur	60ca5aa026	Debug of module withdraw.	2014-11-05 17:32:42 +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
Laurent Destailleur	31c38cedbc	Fix: checkstyle	2014-11-05 16:26:11 +01:00
Laurent Destailleur	f7e71d8848	Fix: checkstyle	2014-11-05 16:23:10 +01:00
Laurent Destailleur	90fb05805c	Fix: Missing translation	2014-11-05 16:21:17 +01:00
Andrelec1	5742e42689	Fix require FormOther ! If agenda module is desable	2014-11-05 14:24:02 +01:00
Laurent Destailleur	0d62556fa0	Maj doc	2014-11-05 11:01:53 +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	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	5c2862dae3	Merge pull request #1976 from frederic34/patch-2 Add a little delay in ajax_autocompleter	2014-11-04 17:41:23 +01:00
Laurent Destailleur	420de76b4b	Merge pull request #1993 from aspangaro/3.6-patch GPLv3	2014-11-04 17:40:38 +01:00
Laurent Destailleur	26bd214e72	Merge pull request #1996 from aspangaro/develop-search Increase list search	2014-11-04 17:40:11 +01:00
Laurent Destailleur	ebb061e68d	Merge pull request #1997 from defrance69/patch-26 Update odf.php	2014-11-04 17:37:47 +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
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
Alexis Algoud	d177a2fbb4	fix bug on thm	2014-11-04 16:13:51 +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
Laurent Destailleur	0a0dd81c9a	Fix: When selecting a carbon copy fro select list, mail was not attached to user.	2014-11-04 13:54:18 +01:00
Andrelec1	796f2409a1	Add verif and correction lang	2014-11-04 11:38:16 +01:00
Laurent Destailleur	0b41df7c35	Clean code to manage multiselect jquery: All code is centralized into function multipleselectarray (except loading of css). Code is prepared to choose which plugin to use (only a if is required to switch or add a new manager). Introduce working version with multiple-select jquery plugin. Removed deprecated old jquery plugin.	2014-11-04 00:33:50 +01:00
aspangaro	f3d7da8feb	Merge remote-tracking branch 'Upstream/develop' into develop-search	2014-11-03 20:25:36 +01:00
Laurent Destailleur	b6b6cced30	Fix: Test sur user assigned not filled Can use empty line into select boolean form.	2014-11-03 20:02:11 +01:00
Laurent Destailleur	a4a01de8a1	Fix: Missing label	2014-11-03 18:00:11 +01:00
Andrelec1	5074feacd6	Add option and create new class	2014-11-03 17:57:55 +01:00
Laurent Destailleur	54e2803926	Missing search table for interventions	2014-11-03 17:48:10 +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	17b372a4b9	css generic	2014-11-03 16:29:45 +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	b2ed53b785	Fix: Switch company/individual	2014-11-03 15:47:33 +01:00
aspangaro	29c6797835	Merge remote-tracking branch 'Upstream/develop' into develop-search	2014-11-03 06:15:45 +01:00
aspangaro	5dacf3c3cd	Contracts services list	2014-11-03 06:12:57 +01:00
aspangaro	111b2e83f1	Contracts list	2014-11-03 06:05:51 +01:00
aspangaro	3ee4cfe30b	Intervention card list	2014-11-03 05:57:09 +01:00
Laurent Destailleur	ddf737daed	Removed deprecated page and option.	2014-11-03 01:07:07 +01:00
aspangaro	a1980a1917	Correct travis error - Not me !	2014-11-02 22:04:01 +01:00
aspangaro	bacf5290d3	Merge remote-tracking branch 'Upstream/develop' into develop-search	2014-11-02 21:48:37 +01:00
aspangaro	39e83576a2	prelevement list	2014-11-02 21:44:03 +01:00
aspangaro	5b23180303	Holiday list	2014-11-02 21:28:02 +01:00
Laurent Destailleur	627f5694f0	Fix: Infinite loop	2014-11-02 21:19:00 +01:00
Laurent Destailleur	1f4f2291f6	Start module with status experimental	2014-11-02 21:18:16 +01:00
Laurent Destailleur	84653f70be	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-11-02 21:16:56 +01:00
Laurent Destailleur	5a18904bb4	Fix: Infinite loop	2014-11-02 21:16:31 +01:00
aspangaro	5bf5b9b16f	Trips list	2014-11-02 21:12:40 +01:00
aspangaro	10ed271e38	Search bank transactions	2014-11-02 20:18:46 +01:00
Laurent Destailleur	2b8abf2794	Fix: Missing label	2014-11-02 20:07:38 +01:00
aspangaro	df5d34266c	Lost button	2014-11-02 15:26:20 +01:00
aspangaro	85f0462c20	Suppliers list	2014-11-02 15:16:49 +01:00
aspangaro	bebf039599	Prospects list	2014-11-02 15:05:20 +01:00
aspangaro	1dcb7a58f3	Presentation & fix SQL injection	2014-11-02 14:51:21 +01:00
aspangaro	ff68c685c0	Customers payments list	2014-11-02 14:41:19 +01:00
aspangaro	6109529c6c	vat payments list & typo on css class	2014-11-02 14:19:28 +01:00
aspangaro	d6a42bda95	Merge remote-tracking branch 'Upstream/develop' into develop-search	2014-11-02 13:55:57 +01:00
Laurent Destailleur	5086450f35	Fix: Forging email content must use dol_concatdesc.	2014-11-02 12:32:38 +01:00
Laurent Destailleur	b74bdb8f7d	Fix: Bad error message	2014-11-02 11:39:30 +01:00
aspangaro	64b9299eb6	Suppliers invoice payment list	2014-11-02 08:45:42 +01:00
aspangaro	e48350fdc1	Unpayed suppliers invoices list	2014-11-02 08:33:39 +01:00
aspangaro	98299f88e8	Suppliers list	2014-11-02 08:12:34 +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	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
BENKE Charles	5586893ca2	Update odf.php add new fonction getvalue (valuename) return value inside [valuename][/valuename] tag	2014-11-01 21:00:28 +01:00
Laurent Destailleur	167ec6917a	Can add prefix into generated filename. This will save time for script to build kit of files for book keeper.	2014-11-01 20:15:51 +01:00
Laurent Destailleur	762eb1cd48	Style were lost	2014-11-01 20:04:01 +01:00
Laurent Destailleur	b8faed9fe8	Fix: translation	2014-11-01 19:50:56 +01:00
Laurent Destailleur	53dfda1413	Fix: Chars - is no more allowed into value for code for extra fields.	2014-11-01 19:34:20 +01:00
aspangaro	26c63f3ea4	donation list	2014-11-01 15:06:46 +01:00
aspangaro	5122b32ccc	Salaries list	2014-11-01 14:59:39 +01:00
aspangaro	a0d3dbd93c	Social Contrib list	2014-11-01 14:52:05 +01:00
aspangaro	9e07c3a7b6	Typo	2014-11-01 14:51:52 +01:00
aspangaro	abfa1a5fde	cheque list	2014-11-01 14:28:28 +01:00
aspangaro	4951feeb8f	Correct rights & presentation	2014-11-01 07:59:52 +01:00
aspangaro	24d0568e5a	Merge remote-tracking branch 'Upstream/develop' into develop-patch	2014-10-31 21:21:52 +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
Maxime Kohlhaas	ccddf0d1be	Fix : actioncomme report was not filtering by entity...	2014-10-31 16:56:14 +01:00
Laurent Destailleur	9c51effe5c	Ajout plus d'info dans description audit.	2014-10-31 15:42:35 +01:00
aspangaro	e43de8b815	Update module accounting	2014-10-31 07:37:59 +01:00
Ion Agorria	557cbaf3d7	Added module descriptor and activation checks Corrected 3 missing $error_occurred flags	2014-10-31 04:59:57 +01:00
aspangaro	57f49ec5d4	GPLv3	2014-10-30 20:41:08 +01:00
Laurent Destailleur	6e0e812531	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-10-30 19:28:43 +01:00
Laurent Destailleur	2f5c7e5f9d	Prepare version 3.7 beta	2014-10-30 19:28:22 +01:00
Frédéric FRANCE	08e958152c	Update ajax.lib.php	2014-10-30 18:45:47 +01:00
Frédéric FRANCE	f18e513046	Update html.form.class.php	2014-10-30 18:44:56 +01:00
Laurent Destailleur	4226c27ccf	Merge pull request #1965 from frederic34/patch-4 On/Off for Object (do not restrict to product)	2014-10-30 18:21: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
Laurent Destailleur	871c4f1b20	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2014-10-30 18:16:06 +01:00
Laurent Destailleur	82812aa679	Merge pull request #1970 from FHenry/develop Add hook method to simply display child lines in order/invoice/propal	2014-10-30 18:11:41 +01:00
Laurent Destailleur	3e12239f11	Merge pull request #1971 from defrance69/patch-25 Update commondocgenerator.class.php	2014-10-30 18:10:52 +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	6a1a0303d8	Merge pull request #1975 from frederic34/patch-1 "Is Order shippable" icon	2014-10-30 18:03:44 +01:00
Laurent Destailleur	28c0c55780	Merge pull request #1977 from atm-maxime/develop Add : statistics on supplier orders and invoices on home page	2014-10-30 17:59:07 +01:00
Laurent Destailleur	80581b2908	Merge pull request #1978 from atm-maxime/3.6 Fix : product list was wrong on supplier invoice because fourn_id is not fetched	2014-10-30 17:56:22 +01:00
Laurent Destailleur	e607a53ca3	Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 Conflicts: ChangeLog	2014-10-30 17:53:38 +01:00
Laurent Destailleur	5ec2c1c4b3	Merge branch '3.6-patch' of github.com:aspangaro/dolibarr into aspangaro-3.6-patch Conflicts: ChangeLog	2014-10-30 17:52:08 +01:00
Laurent Destailleur	d6c1b71350	Merge pull request #1983 from atm-maxime/mkoevols Fixes on extrafields, product supplier prices and user / company association deletion	2014-10-30 17:49:53 +01:00
Laurent Destailleur	bb72932601	Merge pull request #1985 from FHenry/3.6 Fix extrafield from list feature where filter is provided	2014-10-30 17:49:03 +01:00
Laurent Destailleur	c15191375a	Merge pull request #1984 from frederic34/patch-3 No thirdparty name in contract list	2014-10-30 17:36:24 +01:00
Laurent Destailleur	23e9e228c7	Merge pull request #1988 from ilizaran/patch-1 Update server_invoice.php	2014-10-30 17:32:35 +01:00
Laurent Destailleur	2517d54196	Merge pull request #1989 from aternatik/fix_resource Missing translate key into resource module	2014-10-30 17:32:02 +01:00
Laurent Destailleur	38a939771c	New: Add template of emails into dictionnary.	2014-10-30 17:16:51 +01:00
Laurent Destailleur	2dc1cb7c27	Fix: Use correct permission on correct field.	2014-10-30 12:19:38 +01:00
Laurent Destailleur	3ffd4432df	New: Add permissions to read all trips and expenses.	2014-10-30 11:43:57 +01:00
Laurent Destailleur	47c2dc4fcf	Fix: Can see only trip allowed.	2014-10-30 11:36:04 +01:00
Laurent Destailleur	8821fbac76	Merge remote-tracking branch 'origin/3.6' into develop Conflicts: htdocs/product/fiche.php htdocs/user/class/user.class.php	2014-10-30 11:19:29 +01:00
Laurent Destailleur	8248ab4f9a	Fix: doxygen	2014-10-30 11:16:45 +01:00
Laurent Destailleur	750944d718	Fix: var not initialised	2014-10-30 11:16:01 +01:00
Laurent Destailleur	106b4a669f	id_parent and id_children was not set. So introduce new method to return same with no risk to break current working code to address this.	2014-10-30 11:15:13 +01:00
jfefe	e370ffb2d4	Bad function call	2014-10-30 01:33:39 +01:00
jfefe	c5045a75d8	Missing trans key into resource module	2014-10-30 01:16:37 +01:00
Laurent Destailleur	65b73ab778	Fix: td balance	2014-10-29 20:24:33 +01:00
Laurent Destailleur	a0c9af2385	New: Can filter on date into tab "Referring object" of a project.	2014-10-29 20:21:24 +01:00
Laurent Destailleur	3243958a70	New: getNomUrl can point to different page for tasks	2014-10-29 18:01:51 +01:00
Ignacio José Lizarán Rus	fa61faec58	Update server_invoice.php Create Facture with mode_reglement and cond_reglement using thirdparty information.	2014-10-29 17:43:01 +01:00
Ion Agorria	e875f0c2b8	Fixed missing separator	2014-10-29 05:33:59 +01:00
Ion Agorria	4ff570571e	Added SOAP client for creating a client order in remote webservice that thirdparty might have.	2014-10-29 05:13:15 +01:00
Florian HENRY	834a6dc2af	webservice Thirdparty parameter lastname for invidual creation is now lastname and not ref	2014-10-28 16:50:44 +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
Florian HENRY	d846dd2431	Fix extrafield from list feature where filter is provided	2014-10-27 19:38:27 +01:00
Laurent Destailleur	132ddf65d6	Fix: several bugs into document generation (default must be used in priority when not template defined). Fix: use first odt file when no odt file defined. Fix: Must use output translation.	2014-10-27 19:37:30 +01:00
Frédéric FRANCE	0775744b37	No thirdparty name in contract list	2014-10-27 18:27:46 +01:00
Maxime Kohlhaas	8b179c0d2a	Fix : typo	2014-10-27 14:02:37 +01:00
Laurent Destailleur	31d8f792e5	Better responsive design POS	2014-10-27 13:21:33 +01:00
Laurent Destailleur	dd20d04002	Fix: Must use active tag of vat, not county table.	2014-10-27 12:59:19 +01:00
Maxime Kohlhaas	7b7b7e79e9	Merge branch 'develop' of github.com:Dolibarr/dolibarr into mkoevols Conflicts: htdocs/core/lib/company.lib.php	2014-10-27 11:17:44 +01:00
Maxime Kohlhaas	fda32f6638	FixDosFiles	2014-10-27 11:16:18 +01:00
Maxime Kohlhaas	a5739c248e	Fix : Product supplier prices were not working anymore due to bad SQL	2014-10-27 10:23:33 +01:00
Maxime Kohlhaas	42008fcf98	Fix : remove associated users when company is deleted	2014-10-27 10:22:21 +01:00
Maxime Kohlhaas	efd99a6f44	Fix : extrafield errors	2014-10-27 10:20:35 +01:00
Laurent Destailleur	6f77dc83c4	Qual: Uniformize code and fix a ton of bugs.	2014-10-27 03:24:45 +01:00
Laurent Destailleur	badf379489	Fix: [ bug #1618 ] PHP Error thrown when saving a barcode	2014-10-27 01:56:06 +01:00
Laurent Destailleur	2b08417b77	Fix: [ bug #1612 ] Adding free product line line with negative qty in credit notes, doesn't give error message	2014-10-27 01:51:33 +01:00
Laurent Destailleur	9619c0cdea	Fix: [ bug #1581 ] SQL injection possbile	2014-10-27 00:58:56 +01:00
Laurent Destailleur	7bd27a13fa	Fix: missing host and port into object	2014-10-26 19:41:06 +01:00
aspangaro	1405c03f7d	Fix: Civility & birthdate wasn't save into adherent module	2014-10-26 06:48:08 +01:00
MAxime Kohlhaas	374b761fdf	Fix : product list was wrong on supplier invoice because fourn_id is not fetched	2014-10-25 19:20:02 +02:00
MAxime Kohlhaas	3a626d8503	Add : statistics on supplier orders and invoices on home page	2014-10-25 17:22:03 +02:00
Frédéric FRANCE	64a5a260dd	Update admin.lang	2014-10-25 11:54:38 +02:00
Frédéric FRANCE	e08146d053	Update list.php	2014-10-25 11:37:39 +02:00
Frédéric FRANCE	68fa6cec70	Update commande.php	2014-10-25 11:34:21 +02: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
Laurent Destailleur	0fc1c85b34	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 00:42:52 +02:00
Laurent Destailleur	4d515d660c	New: Feature to link manually an order to an invoice does not disappear once link has been done.	2014-10-24 14:17:36 +02:00
Frédéric FRANCE	b2a9b48a78	Update ajax.lib.php Add a delay before making request, may avoid multiple request to server when typing search request	2014-10-24 10:40:48 +02:00
Frédéric FRANCE	6a1d5edf9d	Update list.php	2014-10-24 09:23:39 +02:00
Frédéric FRANCE	8b4706cacd	Update list.php	2014-10-24 08:55:30 +02:00
Laurent Destailleur	1bbdd3798e	Better contrast	2014-10-24 00:53:41 +02:00
Frédéric FRANCE	ccbaba79fb	Update deliveries.lang	2014-10-23 18:42:02 +02:00
Frédéric FRANCE	48a9be28a1	Update deliveries.lang	2014-10-23 18:39:12 +02:00
Frédéric FRANCE	335b0b3c56	Update list.php	2014-10-23 18:33:52 +02:00
Frédéric FRANCE	63e4275afb	Update list.php	2014-10-23 18:32:29 +02:00
Frédéric FRANCE	36ff576d15	"Is Order shippable" icon	2014-10-23 17:48:51 +02:00
Philippe GRAND	463904706b	better display margin infos	2014-10-23 15:02:49 +02:00
BENKE Charles	10f419e372	error on adding fields (bad function	2014-10-23 13:08:39 +02:00
Philippe GRAND	19e194dd81	encrease name length for societe	2014-10-23 12:01:15 +02:00
Frédéric FRANCE	ba9d2c3690	Update card.php	2014-10-23 11:02:16 +02:00
Florian HENRY	7ad0a3d8d6	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-10-23 10:15:58 +02:00
jfefe	29db45c763	Avoid missing class error for fetch_thirdparty method	2014-10-23 01:15:05 +02:00
Laurent Destailleur	d396c62499	Fix: alignement	2014-10-22 23:49:52 +02:00
Laurent Destailleur	639d4f03a0	Experimentation option PROJECT_SHOW_REF_INTO_LISTS	2014-10-22 17:47:12 +02:00
Laurent Destailleur	d267a788d0	Fix: use getpost	2014-10-21 20:02:16 +02:00
jean	619bcb44df	object must be reloaded before creating pdf on confirmation and ordering	2014-10-21 19:02:48 +02:00
Laurent Destailleur	8e63f09764	Fix: Confirm validate must be set on yes by default.	2014-10-20 23:37:28 +02:00
BENKE Charles	c103a5927a	Update commondocgenerator.class.php add : outstanding limit on ODT fix : only public note are display on ODT (private stay private)	2014-10-20 22:28:08 +02:00
Laurent Destailleur	9278d21048	Add missing translation	2014-10-20 13:25:30 +02:00
Laurent Destailleur	e324df2cb9	Some fix again into event list.	2014-10-20 13:20:19 +02:00
Florian HENRY	1eba744e8b	Add hook method to simply display child lines in order/invoice/propal	2014-10-20 13:15:48 +02:00
Laurent Destailleur	866b2a7a88	Fix: Label	2014-10-20 13:14:33 +02:00
Laurent Destailleur	881d338fca	Fix: label of events	2014-10-20 13:07:54 +02:00
Laurent Destailleur	42a600412d	Fix: Regression with favorite.	2014-10-20 12:41:18 +02:00
Laurent Destailleur	4df9fb38fb	Add option AGENDA_ALWAYS_HIDE_AUTO	2014-10-20 12:29:35 +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	8d937d2d36	Uniformize position of "Create link" on categories.	2014-10-19 20:37:46 +02:00
Laurent Destailleur	3fe4c58e95	Use span class="badge" for notes.	2014-10-19 19:57:42 +02:00
Laurent Destailleur	9b24cccd0b	Fix: Better layout detection	2014-10-19 12:24:36 +02:00
Frédéric FRANCE	a14d07930a	Update soc.php	2014-10-18 22:52:54 +02:00
Frédéric FRANCE	761fc32cc1	Update list.php	2014-10-18 22:51:24 +02:00
Frédéric FRANCE	8133b67878	Update product.php	2014-10-18 22:50:17 +02:00
Frédéric FRANCE	5e946d6466	Update card.php	2014-10-18 22:49:07 +02:00
Frédéric FRANCE	5b9a134d69	Update objectonoff.php	2014-10-18 22:47:12 +02:00
Frédéric FRANCE	a1bedcc263	Update ajax.lib.php	2014-10-18 22:46:13 +02:00
Laurent Destailleur	4a60d57544	Merge remote-tracking branch 'origin/3.6' into develop Conflicts: htdocs/core/lib/security.lib.php htdocs/product/fiche.php htdocs/product/liste.php	2014-10-18 21:08:09 +02:00
Frédéric FRANCE	3144fd6845	Update product.php	2014-10-18 18:52:16 +02:00
Frédéric FRANCE	3ab8e13157	Update list.php	2014-10-18 18:51:25 +02:00
Frédéric FRANCE	446e73d8b8	Update card.php	2014-10-18 18:49:47 +02:00
Frédéric FRANCE	eefb211be7	Update ajax.lib.php	2014-10-18 18:48:13 +02:00
Frédéric FRANCE	8bb0ce0f7f	Update ajax.lib.php	2014-10-18 17:17:41 +02:00
Frédéric FRANCE	489045d715	Rename productonoff.php to objectonoff.php	2014-10-18 17:11:47 +02:00
Frédéric FRANCE	dd5ea670e2	Update ajax.lib.php	2014-10-18 17:11:02 +02:00
Grégory DAVID	a794180586	Document the ability to export agenda calendar restricted to project ID	2014-10-18 16:41:47 +02:00
Frédéric FRANCE	830ec9c9cb	Update list.php	2014-10-18 16:36:28 +02:00
Frédéric FRANCE	2107a61bbe	Update ajax.lib.php For use in a list of object	2014-10-18 16:32:32 +02:00
Laurent Destailleur	1d0d3ab747	Merge pull request #1943 from ndrosis/patch-9 Fix Error when trying to clone an Order	2014-10-18 16:28:43 +02:00
Laurent Destailleur	9c69ab966f	Fix: When closing shipment, status was not visible until refresh.	2014-10-18 16:27:15 +02:00
Laurent Destailleur	0193b31a37	Fix: td balance	2014-10-18 16:18:03 +02:00
Laurent Destailleur	13590a876b	Fix: A little clean of dol_hash usage.	2014-10-18 16:08:15 +02:00
Frédéric FRANCE	b80b45c086	Update card.php	2014-10-18 15:55:10 +02:00
Laurent Destailleur	873f8a6f27	If there is at least one favorite into countries, then add a separator into list to show limit between sorted entries and not sorted entries.	2014-10-18 15:53:42 +02:00
Frédéric FRANCE	3a49965820	Update product.php	2014-10-18 15:52:37 +02:00
Frédéric FRANCE	98db599c69	Update card.php	2014-10-18 15:51:05 +02:00
Frédéric FRANCE	96aee6eed4	Update ajax.lib.php	2014-10-18 15:48:59 +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
Laurent Destailleur	331e047c6d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-10-18 15:39:24 +02:00
Laurent Destailleur	ad0f842b60	Merge branch 'mkoevols' of github.com:atm-maxime/dolibarr into atm-maxime-mkoevols Conflicts: htdocs/commande/card.php	2014-10-18 15:38:49 +02:00
Laurent Destailleur	1f5b64c98e	Merge pull request #1964 from frederic34/patch-3 Use javascript On/Off tosell-tobuy if enabled	2014-10-18 15:36:17 +02:00
Laurent Destailleur	6bbeaee8fe	Fix: Selection of users color was not user owner of event.	2014-10-18 15:35:32 +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
Frédéric FRANCE	889dbec97b	Use javascript On/Off tosell-tobuy if enabled	2014-10-18 15:07:38 +02:00
Laurent Destailleur	6a9d825a65	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-10-18 14:57:49 +02:00
Laurent Destailleur	85ce8f8fef	Merge pull request #1959 from aspangaro/develop-usercolor Add field to select color of the user in user's card	2014-10-18 14:57:19 +02:00
Laurent Destailleur	90d47cffae	Better error management and better error message for reporting upload or error of images.	2014-10-18 14:56:06 +02:00
Laurent Destailleur	97f98d7e16	Merge pull request #1955 from frederic34/patch-2 Ajax On/Off for product tosell and tobuy	2014-10-18 14:18:14 +02:00
Laurent Destailleur	79c6d50668	Merge pull request #1962 from IonAgorria/patch-1 Added date start/end at webservice createOrder	2014-10-18 14:11:39 +02:00
Laurent Destailleur	fb76fc94b5	Merge pull request #1963 from defrance69/patch-24 Update functions2.lib.php	2014-10-18 14:11:25 +02:00
Laurent Destailleur	14ea66f3b7	Legend	2014-10-18 02:31:48 +02:00
Laurent Destailleur	b43d96f86c	New: Add id into select_category method.	2014-10-18 02:12:10 +02:00
Laurent Destailleur	58b15fa736	Fix: Solve some regressions	2014-10-18 01:32:38 +02:00
Laurent Destailleur	dbbf31d87b	Fix: Restore comaptibility with all languages. Fix: Corrupting data function.	2014-10-18 00:41:21 +02:00
Laurent Destailleur	f7b1115ab0	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-10-18 00:34:23 +02:00
Laurent Destailleur	f49f9e24b7	Removed useless log and removed REQUEST.	2014-10-18 00:34:08 +02:00
Laurent Destailleur	a2d23fd699	Fix: Error management of hook was duplicating errors.	2014-10-18 00:33:30 +02:00
Juanjo Menent	5dbdb50cd7	Trad: Syncro es_ES from Transifex	2014-10-17 20:35:49 +02:00
BENKE Charles	8095bbf809	Update functions2.lib.php	2014-10-17 17:10:12 +02:00
Laurent Destailleur	e2afa48caa	Fix: avoid warning	2014-10-17 16:23:32 +02:00
Laurent Destailleur	a99bd1c835	Fix: Fix permission on files.	2014-10-17 15:30:38 +02:00
Laurent Destailleur	4b34455f0a	Fix permissions	2014-10-17 15:01:56 +02:00
Laurent Destailleur	fb04b1aedb	More spaced cells	2014-10-17 14:47:17 +02:00
Laurent Destailleur	8581e953f9	Doxygen	2014-10-17 14:45:12 +02:00
Laurent Destailleur	5513a44a07	Fix: translation. Use "template" instead of "pre-defined"	2014-10-17 14:17:52 +02:00
Laurent Destailleur	f1e4f35471	Minor fixes on intervention sql No style on view for one day.	2014-10-17 13:09:18 +02:00
Laurent Destailleur	78d289110d	Trans: Same verb	2014-10-17 13:07:23 +02:00
Laurent Destailleur	7988532e4e	Fix: Bad closing tab on preview pages.	2014-10-17 12:56:54 +02:00
BENKE Charles	589a3fdf95	Update functions2.lib.php	2014-10-17 10:26:34 +02:00
BENKE Charles	5bd665f10d	Update functions2.lib.php disable entity filter fields for module who not use multicompany fields	2014-10-17 09:53:17 +02:00
Laurent Destailleur	e2524fbf77	Fxi: Filter on list view was not correct.	2014-10-16 21:34:35 +02:00
aspangaro	b4a9e6a119	Fix :: Administrator not created on new install	2014-10-16 21:14:57 +02:00
aspangaro	01957de5a2	Merge remote-tracking branch 'Upstream/develop' into develop-usercolor	2014-10-16 21:13:14 +02:00
Laurent Destailleur	7a68d9a940	Miscellaneous fixes	2014-10-16 20:55:13 +02:00
Cubexed	08c9ff275a	Added date start/end at webservice createOrder	2014-10-16 18:09:16 +02:00
Florian HENRY	eeffe4ed34	Reload object when product clone failed (cause of ref already exists) if not done result is blanck pages (header wannot be rewrite (location herder index.php) around line 1542	2014-10-16 13:57:07 +02:00
Maxime Kohlhaas	8e3a3500c2	Add comments (for travis' sake)	2014-10-16 13:28:39 +02:00
aspangaro	18426ab8fc	Merge remote-tracking branch 'Upstream/develop' into develop-usercolor	2014-10-16 06:36:39 +02:00
aspangaro	c1d016a531	Add field to select color of the user in user's card	2014-10-16 06:20:54 +02:00
Laurent Destailleur	c8dd0383d8	New: Function getCurrencyAmount is marked as deprecated. Use function price to output a price including currency symbol.	2014-10-16 01:26:44 +02:00
Laurent Destailleur	a94f7dc3ad	Revert "Add function dolEscapeXML" This reverts commit `756b1d31ad`.	2014-10-16 01:21:33 +02:00
Laurent Destailleur	b90011aeb1	Add function dolEscapeXML	2014-10-16 01:21:10 +02:00
Laurent Destailleur	efa171819a	Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5	2014-10-16 01:19:33 +02:00
Laurent Destailleur	756b1d31ad	Add function dolEscapeXML	2014-10-16 01:01:30 +02:00
aspangaro	2f4822e73b	Merge	2014-10-15 20:43:32 +02:00
Laurent Destailleur	ec18bd3845	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-10-15 18:43:05 +02:00
Laurent Destailleur	38e4100e47	Better translation: Virtual product is a "package product".	2014-10-15 18:21:18 +02:00
Laurent Destailleur	5d57c59241	Fix: Bad parameter of get_substitutionarray_other	2014-10-15 18:16:41 +02:00
Florian HENRY	722f6e0db6	Fix right on product list	2014-10-15 15:24:31 +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	ee4b807a5d	Qual : refactoring extrafields display on objects into a single tpl file	2014-10-14 17:00:06 +02:00
Maxime Kohlhaas	68179c8794	Always editable option for extrafields on invoice and order	2014-10-14 16:13:17 +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	536b579b35	Clean code	2014-10-14 00:27:23 +02:00
Laurent Destailleur	e42ab9ea84	Add legend on peruser view.	2014-10-13 17:45:52 +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	86d25146cc	Qual: Indentation muse be done with css and not using multiple   spaces.	2014-10-13 00:17:37 +02:00
Laurent Destailleur	e101bfceea	Use language to find template email.	2014-10-12 21:24:51 +02:00
Frédéric FRANCE	99dde1ad1e	Update card.php	2014-10-12 20:44:50 +02:00
aspangaro	dc6817813e	Merge remote-tracking branch 'Upstream/develop' into develop-favorite	2014-10-12 20:23:08 +02:00
Regis Houssin	104592b349	Fix: wrong function name	2014-10-12 19:08:34 +02:00
Frédéric FRANCE	7f308bf9b5	Update productonoff.php	2014-10-12 17:00:42 +02:00
Laurent Destailleur	3bac7c9e11	Add index on new table llx_c_email_template	2014-10-12 16:31:56 +02:00
Frédéric FRANCE	33bb150b44	Update productonoff.php	2014-10-12 16:30:58 +02:00
Laurent Destailleur	8df8fb2fe0	Qual: Removed a lot of duplicate code New: extrafields for projects and tasks are exported to ODT documents.	2014-10-12 16:19:00 +02:00
Frédéric FRANCE	f5f50045d6	Update ajax.lib.php	2014-10-12 16:09:42 +02:00
Frédéric FRANCE	052e507271	Update productonoff.php	2014-10-12 15:56:04 +02:00
Frédéric FRANCE	f25c4f18e6	Update ajax.lib.php	2014-10-12 15:55:18 +02:00
Laurent Destailleur	30e27014b8	Fix: box of customer and propsects were not correctly disabled.	2014-10-12 15:49:14 +02:00
aspangaro	dad9a54959	Merge remote-tracking branch 'Upstream/develop' into develop-favorite	2014-10-12 15:47:29 +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	5c07df812d	Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6	2014-10-12 15:24:33 +02:00
Laurent Destailleur	cbbe909bc5	Fix: Pb in management of "or" ("\|") for permission check.	2014-10-12 15:22:07 +02:00
Frédéric FRANCE	633f01e5a2	Update card.php	2014-10-12 14:26:51 +02:00
Frédéric FRANCE	77d7764215	Create productonoff.php	2014-10-12 14:22:32 +02:00
Frédéric FRANCE	e6e953b4d8	Update ajax.lib.php	2014-10-12 14:20:49 +02:00
Laurent Destailleur	7dab06952c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-10-12 14:11:39 +02:00
Laurent Destailleur	bba6dc6398	Better contrast	2014-10-12 14:11:16 +02:00
Laurent Destailleur	65f47f7d10	New: Add number of active notification into tab title (like we do for notes and documents)	2014-10-12 12:22:45 +02:00
Laurent Destailleur	f08759a17e	Fix: area to generate doc must use half size not onethird. Fix: Missing maxwidthonsmartphone. Fix: Missing backtopage Fix: Missing translation key	2014-10-12 11:59:52 +02:00
Laurent Destailleur	9768550696	Merge remote-tracking branch 'origin/3.6' into develop Conflicts: ChangeLog htdocs/categories/fiche.php htdocs/comm/action/index.php htdocs/comm/propal.php htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/class/contrat.class.php htdocs/core/class/commonobject.class.php htdocs/core/tpl/objectline_create.tpl.php htdocs/fourn/fiche.php htdocs/product/composition/fiche.php htdocs/product/price.php htdocs/projet/tasks/task.php htdocs/projet/tasks/time.php	2014-10-12 02:54:34 +02:00
Laurent Destailleur	c5d8012eb1	Merge remote-tracking branch 'origin/3.5' into 3.6 Conflicts: htdocs/core/lib/date.lib.php	2014-10-12 02:13:38 +02:00
Laurent Destailleur	797ab8a150	Merge pull request #1940 from aternatik/fix-cron Missing reprogramming task into GUI for cron module.	2014-10-12 02:10:09 +02:00
Laurent Destailleur	c30f13a03d	Fix: label of input method not translated.	2014-10-12 02:07:50 +02:00
Laurent Destailleur	591b40e674	Some fix with export definition. Works now with pgql too.	2014-10-12 01:59:21 +02:00
Laurent Destailleur	a69fb2126c	Merge pull request #1861 from defrance69/patch-20 Update modContrat.class.php	2014-10-12 01:40:00 +02:00
Laurent Destailleur	13090ed778	Merge pull request #1944 from aspangaro/develop-accounting Fix :: Button on/off for account in chart of accounts	2014-10-12 01:38:40 +02:00
Laurent Destailleur	dad1e312ab	Merge pull request #1939 from atm-maxime/3.6 Fix bug 1588 : relative discount	2014-10-12 01:37:39 +02:00
Laurent Destailleur	5a8f625ff1	Merge pull request #1942 from fappels/develop Fix increase stock on shipment validation	2014-10-12 01:36:22 +02:00
Laurent Destailleur	5e0c7688d5	Merge pull request #1949 from defrance69/patch-23 Update product.class.php	2014-10-12 01:33:37 +02:00
Laurent Destailleur	5f0c2b34dc	Merge pull request #1954 from marcosgdf/lowecased-booleans Lowercased booleans to fit with PSR-2 specification.	2014-10-12 01:31:35 +02:00
Laurent Destailleur	44e2cd2194	Prepare code to manage task_datehour with task_date.	2014-10-12 01:20:03 +02:00
Laurent Destailleur	2b479aa0b4	Qual: Uniformize translated label of progress on all pages. Fix: Color of first line of documents. Fix: The calculated progress was not calculated.	2014-10-12 01:04:34 +02:00
Marcos García de La Fuente	f7a44347cb	Lowecased booleans to fit with PSR-2 specification.	2014-10-12 00:23:19 +02:00
Laurent Destailleur	6c3c1d3a0a	Merge pull request #1930 from GPCsolutions/reportprogress Allow reporting progress along with timespent	2014-10-12 00:10:28 +02:00
Laurent Destailleur	fc63e8b9dc	Fix: ErrorBadValueForParamNotAString error message in price customer multiprice	2014-10-11 23:55:10 +02:00
Laurent Destailleur	e9881997ed	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-10-11 23:50:27 +02:00
Laurent Destailleur	52e1bd2ad1	Merge	2014-10-11 23:46:49 +02:00
Laurent Destailleur	77ed7bf5df	Merge branch 'develop-HiddenMailPasswordForgotten' of github.com:Devensys/dolibarr into Devensys-develop-HiddenMailPasswordForgotten Conflicts: htdocs/core/lib/functions.lib.php	2014-10-11 23:44:50 +02:00
Laurent Destailleur	a9e6e93c59	Merge pull request #1953 from jfefe/patch-6 Allow to make PUT request with getURLContent() function	2014-10-11 23:32:25 +02:00
Laurent Destailleur	2800faffa8	Fix: File names must be in lowercase. Fix: Missing includes.	2014-10-11 18:27:30 +02:00
Laurent Destailleur	a804fe62b4	Fix: translation for vi_VN	2014-10-11 15:46:37 +02:00
Laurent Destailleur	cd8936a224	Clean deprecated code.	2014-10-11 15:04:42 +02:00
Laurent Destailleur	0dc82cddf1	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/langs/es_ES/accountancy.lang htdocs/langs/es_ES/admin.lang htdocs/langs/es_ES/agenda.lang htdocs/langs/es_ES/categories.lang htdocs/langs/es_ES/companies.lang htdocs/langs/es_ES/compta.lang htdocs/langs/es_ES/donations.lang htdocs/langs/es_ES/errors.lang htdocs/langs/es_ES/holiday.lang htdocs/langs/es_ES/interventions.lang htdocs/langs/es_ES/projects.lang htdocs/langs/es_ES/sendings.lang htdocs/langs/es_ES/suppliers.lang	2014-10-11 14:42:45 +02:00
Laurent Destailleur	8a98f8461d	Sync transifex	2014-10-11 14:33:22 +02:00
jfefe	eb06c8a33e	Allow to make PUT request with getURLContent() function	2014-10-11 04:25:32 +02:00
Juanjo Menent	f1104275b4	Trad: Syncro es_ES/compta.lang from transifex	2014-10-10 22:11:00 +02:00
Juanjo Menent	2f3abd3774	Trad: Syncro es_ES from transifex	2014-10-10 21:50:05 +02:00
Regis Houssin	c01edd76f6	Fix: avoid warning	2014-10-10 16:53:21 +02:00
Andrelec1	269b960d9a	Add support tld with dots	2014-10-10 15:18:24 +02:00
Andrelec1	f4f1f45d5a	copyright and annotation	2014-10-10 15:01:10 +02:00
Andrelec1	7978b4503d	Add function hideMail and use	2014-10-10 14:57:07 +02:00
aspangaro	4f024acc3e	Merge remote-tracking branch 'Upstream/develop' into develop-accounting	2014-10-10 05:31:08 +02:00
BENKE Charles	00c5c940c9	Update product.class.php Label of product on tooltip is more usefull than the ref who's already on the link	2014-10-09 21:31:35 +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	31a96aa4c6	Fix: CRLF	2014-10-09 17:18:14 +02:00
Laurent Destailleur	a19e8aa89d	Sync transifex	2014-10-09 17:15:15 +02:00
Laurent Destailleur	60a6e2a579	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-10-09 17:06:13 +02:00
Laurent Destailleur	06cc08026b	Some fix on per user view.	2014-10-09 17:05:57 +02:00
Maxime Kohlhaas	4fd67d725a	Fix bug 1588 : relative discount not working anymore	2014-10-09 13:58:43 +02:00
Laurent Destailleur	0390085f54	Style for install match css of login.	2014-10-09 13:47:40 +02:00
aspangaro	417fd13663	Merge remote-tracking branch 'Upstream/develop' into develop-accounting	2014-10-09 04:56:27 +02:00
Laurent Destailleur	f9377a4715	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-10-08 20:57:11 +02:00
Laurent Destailleur	de5005ca54	Fix: Avoid duplicate error message Fix: pgsql syntax error	2014-10-08 15:35:39 +02:00
Laurent Destailleur	4c4485d0ee	More comment to explain and remove a todo.	2014-10-08 15:24:35 +02:00
Laurent Destailleur	56f5c666cc	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-10-08 15:09:32 +02:00
Laurent Destailleur	168b0db094	Fix: button must be align to right	2014-10-08 15:09:07 +02:00
Regis Houssin	cc553514af	Fix: add constant MAIN_OVERWRITE_THEME_PATH if the theme does not have the same name as the module	2014-10-08 14:51:16 +02:00
aspangaro	b8a40a1b32	Presentation	2014-10-08 06:24:46 +02:00
Laurent Destailleur	2bbede6465	New: Can add product into category from category card.	2014-10-07 21:39:10 +02:00
Laurent Destailleur	0a4d040e9d	Fix: Warning sur traduction	2014-10-07 21:15:14 +02:00
aspangaro	95dc569fe2	Merge remote-tracking branch 'Upstream/develop' into develop-accounting	2014-10-07 20:51:59 +02:00
aspangaro	e8ac6567b7	Fix :: Button on/off for account in chart of accounts	2014-10-07 20:50:57 +02:00
Juanjo Menent	75eb61702e	Fix: Showing accounting account fails	2014-10-07 12:46:05 +02:00
Drosis Nikos	0c7cabbf37	Fix Error when trying to clone an Order	2014-10-06 16:15:11 +03:00
Laurent Destailleur	cfc5bb845a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-10-06 14:49:10 +02:00
jfefe	6a4468d94e	Not need to test if class exists with require_once	2014-10-06 14:18:28 +02:00
Francis Appels	1e6240953e	Fix increase stock on shipment validation $obj not set. Re-enabled delete button for shipment with batches, was increase issue, not decrease issue.	2014-10-06 14:10:27 +02:00
jfefe	87fc27c7e6	Avoid missing class error for fetch_thirdparty method	2014-10-06 13:31:01 +02:00
jfefe	fdbf2fb45d	Missing reprogramming task into GUI for cron module. Without this, a new task is never executed (because without datenextrun defined)	2014-10-06 13:28:07 +02:00
Regis Houssin	3ddcac5ced	Fix: missing $ismultientitymanaged	2014-10-06 09:12:19 +02:00
Regis Houssin	692881bf59	Fix: missing $ismultientitymanaged	2014-10-06 09:07:09 +02:00
Regis Houssin	a2446e51db	New: add context "globalcard" for declaring only once all cards	2014-10-06 07:20:58 +02:00
Laurent Destailleur	a2fed6f214	Fix: miss dol_fiche_end	2014-10-05 23:26:42 +02:00
Laurent Destailleur	60f643cf1a	Change comented log to help debug	2014-10-05 20:26:35 +02:00
Laurent Destailleur	c73f4a14ee	Fix: Bad days returned by function	2014-10-05 16:17:09 +02:00
Laurent Destailleur	742d0e37ee	Fix: Bad month return by function	2014-10-05 12:54:51 +02:00
Laurent Destailleur	968b021985	Fix trad and sql error	2014-10-05 05:37:01 +02:00
Laurent Destailleur	3b6c533b85	Fix translation	2014-10-05 05:13:46 +02:00
Laurent Destailleur	81c28f528d	Fix translation	2014-10-05 05:13:09 +02:00
Laurent Destailleur	85f0d6c3ea	Fix: Edition of event	2014-10-05 04:51:34 +02:00
Laurent Destailleur	bb852592e6	Fix: Restore broken feature. One hook = One call of function per module.	2014-10-05 04:49:46 +02:00
Laurent Destailleur	c51b964b19	Fix: Pb when showing availability	2014-10-05 03:44:20 +02:00
Laurent Destailleur	5c5f725a34	Fix scrutinizer	2014-10-05 01:22:17 +02:00
Laurent Destailleur	11d1be882c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/contrat/list.php	2014-10-04 17:32:01 +02:00
Laurent Destailleur	5601c979ab	New: Can search list of thirdparties from web service on part of name.	2014-10-04 17:29:04 +02:00
Laurent Destailleur	97eec37f1c	Uniformize code: property "nom" for thirdparty is aliased into "name" everywhere.	2014-10-04 17:20:17 +02:00
Laurent Destailleur	69475b7bf8	Sync from transifex. Fix var not initialized.	2014-10-04 12:49:30 +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
Laurent Destailleur	02512180e0	Sync from transifex	2014-10-03 19:21:45 +02:00
Laurent Destailleur	d518278166	Merge remote-tracking branch 'origin/3.5' into 3.6 Conflicts: htdocs/comm/propal.php htdocs/comm/propal/class/propal.class.php htdocs/commande/fiche.php htdocs/compta/facture/class/facture.class.php	2014-10-03 19:17:28 +02:00
Laurent Destailleur	dde3b3ef65	Fix: Event update	2014-10-03 18:25:38 +02:00
Laurent Destailleur	f9d78c0c57	Fix: edit event New: Can use color of type of event into dictionnary.	2014-10-03 18:04:13 +02:00
Laurent Destailleur	e7a9447d94	Add hook formatEvent and fix bug into per user view.	2014-10-03 15:58:08 +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	844b5f30df	Minor look enhancement	2014-10-03 12:54:29 +02:00
Laurent Destailleur	cbd48f5129	Add missing picto	2014-10-03 12:48:24 +02:00
Francis Appels	bcc5bebd77	Fix deliveryorder qty and remainingqty positions	2014-10-03 12:28:42 +02:00
Francis Appels	840a98d8ac	Expedition lines from same orderline merged. When there are more expedition lines from same orderline key, merge them and get source warehouses. Usefull future possibility for creating shippinglines with same products from multiple warehouses. @KreizIT also changed some batch related items.	2014-10-03 12:20:02 +02:00
Laurent Destailleur	166853dd56	Fix: miscellaneous bugs	2014-10-03 12:15:21 +02:00
Laurent Destailleur	bc1279ccfa	Brighter button. We use CSS and no more image.	2014-10-03 11:27:12 +02:00
Laurent Destailleur	1b0b49cceb	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-10-03 03:53:11 +02:00
Laurent Destailleur	494e6786b3	Fix: Translation	2014-10-03 03:52:50 +02:00
Laurent Destailleur	a853aed348	Fix: Some fields not visibles. Wrong value for calculated time.	2014-10-03 03:42:11 +02:00
Laurent Destailleur	868809caba	Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6	2014-10-03 03:22:37 +02:00
Laurent Destailleur	33ddbd7425	Merge pull request #1932 from Xebax/develop Fix bug #1604: "When a member is created, the birthday is not recorded" and bug #1610: "Civility is not displayed".	2014-10-03 03:17:45 +02:00
Laurent Destailleur	c69565fd69	Fix: column name should not be an numeric	2014-10-03 03:12:39 +02:00
Laurent Destailleur	ebd86f5388	Merge pull request #1931 from ndrosis/patch-8 Fix Lang for Payment Type	2014-10-03 02:47:25 +02:00
Laurent Destailleur	b5be8ff620	Fix: Avoid error ErrorBadValueForParamNotAString	2014-10-03 02:45:47 +02:00
Laurent Destailleur	5ac63ec534	Solve fixme.	2014-10-03 02:00:50 +02:00
Laurent Destailleur	7fb2d4d1c9	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-10-03 01:48:28 +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
Florian HENRY	4b28ff005e	Return error message on category creation failure	2014-10-02 15:24:40 +02:00
Florian HENRY	d6fc967162	Merge branch '3.6' into 3.6_fix	2014-10-02 15:22:23 +02:00
Florian HENRY	78ec4d595b	Fix trad currency	2014-10-02 15:21:49 +02:00
Regis Houssin	4248c7bed2	Fix: strict mode paradise	2014-10-02 09:30:31 +02:00
Regis Houssin	30221ae8cf	Fix: missing fields	2014-10-02 09:00:40 +02:00
Regis Houssin	2425fdfadd	FIXME $socid is not defined (strict mode)	2014-10-02 08:44:49 +02:00
Regis Houssin	1541be8790	FIXME $key is not defined (strict mode)	2014-10-02 08:40:51 +02:00
Xebax	add55e480e	Fix bug #1610 : Civility is not displayed.	2014-10-01 22:00:45 +02:00
Raphaël Doursenaud	769d824e7b	Allow reporting progress along with timespent	2014-10-01 14:12:47 +02:00
BadPixxel	f178aa65ca	removed "thumb\" subdir addition Category Image Thumb sub-folder now directly added by function liste_photos	2014-09-30 19:43:21 +02:00
BadPixxel	d6c8f65dad	Minor BugFix : Missing thumbs folder in Category Images List Sub-folder for thumbs was missing in category image list, url was wrong....	2014-09-30 19:37:13 +02:00
BadPixxel	cf2ba78fc1	Missing Key for getNomUrl function	2014-09-30 19:11:01 +02:00
BadPixxel	12e6d1bf6c	Missing Key for getNomUrl function	2014-09-30 19:09:59 +02:00
BadPixxel	820e6e5d95	Minor BugFix : Compatibility of function getNomUrl Using Ref & Label for Category Name display is necessary for compatibility	2014-09-30 19:01:43 +02:00
Maxime Kohlhaas	920c9c7251	Fix : tva not coming from multiprice	2014-09-30 17:36:01 +02:00
BadPixxel	f3eec7582e	Minor BugFix : Wrong variable reference in getNomUrl Display of Category Url was incompete due to reference to "$ref" instead of "$label"	2014-09-30 16:00:04 +02:00
Xebax	11b3b94e6f	Fix bug #1604 : When a member is created, the birthday is not recorded.	2014-09-30 01:37:36 +02:00
Regis Houssin	f0551fe6d2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-09-29 20:43:34 +02:00
Regis Houssin	ba95251ea2	Fix: uniformize code	2014-09-29 20:43:20 +02:00
Laurent Destailleur	bbf07641ed	Fix: checkstyle	2014-09-29 20:39:19 +02:00
Drosis Nikos	8c6ce79d9d	Fix Lang for Payment Type	2014-09-29 18:15:09 +03:00
Laurent Destailleur	ec2a8b5551	Merge pull request #1800 from Devensys/Develop-HighlitingIBAN Highliting IBAN (sepa)	2014-09-29 16:43:22 +02:00
Laurent Destailleur	8121aeb0b6	Merge pull request #1914 from aternatik/fix_ldapgrp Fix: gidNumber ldap attribute was not defined	2014-09-29 16:39:36 +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
Florian HENRY	056e3ec2af	Fix travis (strange I didn't update this file)	2014-09-29 16:24:45 +02:00
Laurent Destailleur	cb302c16e7	Bad place of code	2014-09-29 16:22:00 +02:00
Florian HENRY	46f673fb5f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/contrat/class/contrat.class.php htdocs/fourn/card.php	2014-09-29 16:01:49 +02:00
Laurent Destailleur	c6fc07e412	Merge pull request #1926 from fmarcet/3.6 Fix: Withdrawal total amount is double	2014-09-29 15:41:59 +02:00
Laurent Destailleur	ba33f73767	Merge pull request #1925 from tiaris/develop adding hooks for supplier card and order card	2014-09-29 15:40:31 +02:00

... 20 21 22 23 24 ...

39761 Commits