9885 Commits

Author	SHA1	Message	Date
Alexandre SPANGARO	d9b9913e8a	NEW: Accountancy - Add mode intra & export for product or service bought	2020-03-01 04:52:12 +01:00
Laurent Destailleur	f2dba4f621	Merge pull request #13227 from aspangaro/12.0_a16 ... NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality	2020-02-29 13:02:43 +01:00
Laurent Destailleur	56704e4029	Add stats of products in MO	2020-02-28 19:26:52 +01:00
Laurent Destailleur	bfb9739ae8	Fix manufacuring efficiency on bom lines.	2020-02-28 16:12:42 +01:00
Alexandre SPANGARO	86d9622360	NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality	2020-02-27 10:44:04 +01:00
Laurent Destailleur	8445c1d814	Merge pull request #13199 from dolibit-ut/patch-2 ... Update HOWTO-Translation.txt	2020-02-26 05:12:44 +01:00
Laurent Destailleur	cb9637e38d	Doc	2020-02-25 15:04:56 +01:00
Laurent Destailleur	2c6e7f2917	Tooltip for example on IP restrictions	2020-02-25 13:40:19 +01:00
Laurent Destailleur	dbe770a24f	Trans	2020-02-25 13:07:39 +01:00
UT from dolibit	376e19f621	Update HOWTO-Translation.txt	2020-02-25 13:05:23 +01:00
Laurent Destailleur	6c4d782a81	Trans	2020-02-25 12:48:22 +01:00
VESSILLER	73da62d842	NEW Add product on key "Enter" in search bar	2020-02-24 13:57:36 +01:00
John Botella	98407347e7	Update extrafield printable desc	2020-02-24 13:44:26 +01:00
ATM john	13790422dc	Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty	2020-02-24 00:18:37 +01:00
Laurent Destailleur	90565e4637	Merge pull request #13179 from atm-john/12.0_new_allow_extrafields_on_pdf ... NEW allow display extrafields on pdf	2020-02-23 22:55:16 +01:00
Laurent Destailleur	f931b92d36	Merge branch 'new-takepos-batch-decrement' of ... https://github.com/OPEN-DSI/dolibarr into develop # Conflicts: # htdocs/langs/en_US/errors.lang	2020-02-23 22:49:03 +01:00
Laurent Destailleur	d1de562674	Merge pull request #13172 from futurehousestore/productlist2 ... Add Products/Services by popularity in Orders	2020-02-23 22:46:07 +01:00
ATM john	fe4e00b139	Add new params to extrafields forms to allow extrafields to be displayed on pdf documents	2020-02-23 11:32:38 +01:00
Laurent Destailleur	1d34ef213c	Fix error management	2020-02-22 12:19:46 +01:00
ATM john	4117aa56a2	Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty	2020-02-22 11:19:49 +01:00
futurehousestore	16b4e680f7	Add Products/Services by popularity in Orders	2020-02-22 02:45:58 +00:00
Laurent Destailleur	badc4327c2	Merge branch 'develop' into patch-3	2020-02-21 19:45:33 +01:00
Laurent Destailleur	e4b00c5c20	Merge branch 'develop' into master	2020-02-21 18:20:10 +01:00
Laurent Destailleur	7909055ee8	Enhance multilangue support in website module	2020-02-21 11:36:16 +01:00
VESSILLER	71c9b94b22	NEW add const CASHDESK_FORCE_DECREASE_STOCK to force batch decrementation	2020-02-21 11:08:34 +01:00
javierybar	2942e85e47	More elegant and easy to understand printer setup	2020-02-20 15:16:17 +01:00
Laurent Destailleur	d6d0c9eaef	Merge pull request #12560 from Tetras-Libre/takepos-sort-product ... NEW Takepos : Sort products by reference	2020-02-20 01:39:52 +01:00
Laurent Destailleur	895503d2eb	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/index.php htdocs/core/class/CMailFile.class.php	2020-02-20 00:21:25 +01:00
Laurent Destailleur	c14daa2790	Can set main language and sublanguages of a website	2020-02-19 18:32:04 +01:00
Laurent Destailleur	db1e324ba5	Fix trans	2020-02-19 13:58:04 +01:00
Laurent Destailleur	f109864670	NEW Add a profil to import contact categories ... Load roles of contact only when required	2020-02-19 13:22:24 +01:00
John Botella	6acf10c0d4	extend retained warranty to be available for all invoices	2020-02-19 11:54:55 +01:00
Laurent Destailleur	9883c0b688	Merge pull request #12677 from OPEN-DSI/new-project-weighted-amount ... NEW add weighted amount on project/opportunity	2020-02-19 00:03:03 +01:00
Laurent Destailleur	2ac064059a	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/admin.lang htdocs/projet/element.php	2020-02-18 22:40:43 +01:00
Laurent Destailleur	9ce0e6869e	Fix trans	2020-02-18 11:55:39 +01:00
David Beniamine	1cd566f1ae	Merge tag 'develop' of https://github.com/Dolibarr/dolibarr into takepos-sort-product	2020-02-18 11:09:45 +01:00
Laurent Destailleur	1d760f0e42	Add MO in project overwiew	2020-02-17 21:24:59 +01:00
Laurent Destailleur	1904ae0e82	FIX Type of contact for event does not exists and not supported ... FIX Type of contact not saved when creating a contact FIX SQL Overload in default contact trigger. FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER Conflicts: htdocs/supplier_proposal/class/supplier_proposal.class.php	2020-02-17 12:25:51 +01:00
Laurent Destailleur	a02f5cde92	FIX Type of contact for event does not exists and not supported ... FIX Type of contact not saved when creating a contact FIX SQL Overload in default contact trigger. FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER	2020-02-17 12:21:07 +01:00
Laurent Destailleur	f4f3efec62	Fight against $_POST	2020-02-16 19:33:58 +01:00
Laurent Destailleur	ed778bd28f	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/public/ticket/view.php	2020-02-15 18:13:35 +01:00
Laurent Destailleur	2b3cc0d048	Fix add both public id and ref in topic	2020-02-15 18:00:09 +01:00
Laurent Destailleur	58a2a71605	Merge pull request #13067 from maboelfotoh/custom ... NEW add Opening Balance column to balance.php	2020-02-14 19:25:18 +01:00
Muhammad Aboelfotoh	ce6cf04028	Add new view for balance.php that additionally shows opening balance	2020-02-13 13:53:07 +00:00
Laurent Destailleur	a4f13194c3	Merge pull request #12503 from atm-greg/New_Supplier_Packaging ... NEW Experiment supplier packaging with option PRODUCT_USE_SUPPLIER_PACKAGING: Using price according to the minimum quantity	2020-02-13 10:50:56 +01:00
Laurent Destailleur	4762bafb02	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/subscription/list.php htdocs/mrp/class/mo.class.php	2020-02-12 22:58:37 +01:00
Laurent Destailleur	139dfc3022	Debug MRP module	2020-02-12 22:45:27 +01:00
Laurent Destailleur	0d366c45e5	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-02-12 21:43:44 +01:00
Laurent Destailleur	0f12003782	Trans	2020-02-12 21:20:55 +01:00
Laurent Destailleur	8518e0752f	NEW Can edit option PDF_USE_ALSO_LANGUAGE_CODE from PDF setup page	2020-02-11 16:01:32 +01:00
Laurent Destailleur	05f0242198	NEW The info_admin() can show text after click on other text	2020-02-11 10:38:09 +01:00
Laurent Destailleur	8604ff99ed	Merge pull request #13068 from andreubisquerra/develop ... Add time tags to Receipt Printers module	2020-02-10 15:37:37 +01:00
Laurent Destailleur	3baf0e66b9	Trans	2020-02-10 01:11:52 +01:00
andreubisquerra	bc8d9e6c7e	Add langs tags	2020-02-09 14:04:22 +01:00
Laurent Destailleur	1ee959a11f	Generic graph	2020-02-08 17:46:41 +01:00
andreubisquerra	c52e26991a	Add receipt tags to lang	2020-02-07 18:32:08 +01:00
Laurent Destailleur	cd58822d98	Can edit a table of resolution code for tickets	2020-02-07 12:48:41 +01:00
Laurent Destailleur	9c73bb1aef	NEW Can create an deposit from order using a percentage of qty.	2020-02-06 14:15:41 +01:00
atm-greg	f8ffdea5ae	Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_Supplier_Packaging	2020-02-06 09:59:42 +01:00
Laurent Destailleur	4f3cc87077	FIX Confusion between 'bank reconciled' and 'accounted'. Show both data	2020-02-05 19:23:38 +01:00
Laurent Destailleur	30fa8940a9	FIX Confusion between 'bank reconciled' and 'accounted'. Show both data	2020-02-05 19:23:00 +01:00
Laurent Destailleur	f3e27695e2	FIX Avoid deletion of bank record if in accounting	2020-02-05 16:35:50 +01:00
Laurent Destailleur	44ed5980f5	FIX Avoid deletion of bank record if in accounting	2020-02-05 16:35:09 +01:00
Laurent Destailleur	1875b6a49b	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/company.lib.php htdocs/core/lib/security2.lib.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php htdocs/core/modules/expedition/doc/pdf_espadon.modules.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/core/modules/facture/doc/pdf_sponge.modules.php htdocs/core/modules/livraison/doc/pdf_typhon.modules.php htdocs/core/modules/propale/doc/pdf_cyan.modules.php htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php	2020-02-05 14:53:47 +01:00
AdrianDominik	4695172028	Merge remote-tracking branch 'upstream/11.0' into 11.0	2020-02-04 11:40:37 +01:00
andreubisquerra	5a248f31a6	Add langs	2020-02-03 19:34:39 +01:00
Laurent Destailleur	36461afea9	FIX Creation of Stripe card from backoffice must return a clean message	2020-02-03 14:55:02 +01:00
Laurent Destailleur	7b661e707e	FIX Creation of Stripe card from backoffice must return a clean message	2020-02-03 14:54:35 +01:00
AdrianDominik	ad2e10a679	FIX: #12908 User login with credentials from self-subscription form fails	2020-02-03 09:54:34 +01:00
Laurent Destailleur	ff6bcbdcf8	Fix trans	2020-02-03 03:10:03 +01:00
Laurent Destailleur	3f73339818	Fix trans	2020-02-03 03:01:23 +01:00
Laurent Destailleur	21e4717721	Merge pull request #12983 from atm-quentin/NEW_monthly_view ... NEW monthly view to enter time	2020-02-02 20:05:18 +01:00
Laurent Destailleur	f752551914	WIP Generic stats page	2020-01-31 14:53:47 +01:00
atm-quentin	a001913751	Debut modification saisie par mois ... NEW hook and data id NEW visu FROM day TO day in permonth view FIX	2020-01-31 11:21:49 +01:00
Laurent Destailleur	51c6540a56	WIP Advanced search	2020-01-30 23:28:50 +01:00
Laurent Destailleur	d0c37a3c61	css	2020-01-30 12:24:04 +01:00
Laurent Destailleur	2791f10e18	Merge pull request #12934 from aspangaro/12.0_a10 ... NEW: Accountancy - General ledger - Add an option to search not reconciled line	2020-01-30 01:48:21 +01:00
Laurent Destailleur	1e879126cd	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/exports/class/export.class.php	2020-01-29 19:28:06 +01:00
Laurent Destailleur	633ba666aa	Add info of email reference syntax to help debug.	2020-01-29 19:26:04 +01:00
Laurent Destailleur	60f772d285	FIX Pending amount to pay must be zero if invoice close for anticipated ... payment.	2020-01-29 17:56:09 +01:00
Laurent Destailleur	7c34d97e2d	Fix messages for SPF	2020-01-29 13:10:16 +01:00
Alexandre SPANGARO	074e55fca5	NEW: Accountancy - General ledger - Add an option to search not reconciled line	2020-01-28 22:56:26 +01:00
Laurent Destailleur	80707d6a5e	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-28 17:24:26 +01:00
Laurent Destailleur	40636adb56	Enhance #12865 ... No need of option. A new parameter on url is enough.	2020-01-28 03:34:56 +01:00
Laurent Destailleur	a02a2a6def	Sync transifex	2020-01-27 16:07:53 +01:00
Alexandre SPANGARO	e70e74de94	NEW: Accountancy - General ledger - Add an option to search not lettering line	2020-01-27 05:21:56 +01:00
Laurent Destailleur	0271a43e80	Merge branch 'develop' into master	2020-01-27 02:17:14 +01:00
Laurent Destailleur	539348bbbb	Responsive TakePOS with Bar.	2020-01-27 01:31:39 +01:00
Laurent Destailleur	30a5ab479f	Can choose text to show when there is no data	2020-01-25 22:43:24 +01:00
Laurent Destailleur	0f2141269a	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/supplier_proposal/class/supplier_proposal.class.php	2020-01-25 14:43:57 +01:00
Laurent Destailleur	c494e3029b	Trans	2020-01-24 20:14:01 +01:00
Laurent Destailleur	08d8670bb3	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/product/class/product.class.php	2020-01-24 20:12:27 +01:00
Laurent Destailleur	de4183ea65	Update logos	2020-01-24 17:30:46 +01:00
Laurent Destailleur	17f28189f9	Virtual stock must include Manufacturing Orders	2020-01-24 14:51:45 +01:00
Laurent Destailleur	f06f15de2e	Merge pull request #12861 from TobiasSekan/ShowHolidaysInAgenda ... New: Show holidays in the agenda view (month, week, day)	2020-01-22 14:13:55 +01:00
Laurent Destailleur	d3411a79ef	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-22 14:11:44 +01:00
Laurent Destailleur	0456994f0d	Responsive	2020-01-22 13:34:21 +01:00
Laurent Destailleur	e3a21c55d1	Fix label	2020-01-21 21:37:10 +01:00
Laurent Destailleur	60a6dc5545	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-21 13:26:46 +01:00
Laurent Destailleur	6d50cc1899	Update demo profiles	2020-01-21 13:25:38 +01:00
Laurent Destailleur	2d07a08e55	Fix init of specimen	2020-01-21 00:22:57 +01:00
Laurent Destailleur	80483fc085	Fix init of specimen	2020-01-21 00:20:03 +01:00
Laurent Destailleur	92856788a3	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-20 18:39:46 +01:00
Laurent Destailleur	206cfcd7fe	Clean code for inventory	2020-01-20 02:07:47 +01:00
Laurent Destailleur	65fef47bdb	Enable new pdf templates as stable	2020-01-20 01:05:30 +01:00
Laurent Destailleur	e679e05f57	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-19 19:49:04 +01:00
andreubisquerra	98789c908e	Colorful theme for TakePOS	2020-01-19 19:16:45 +01:00
Laurent Destailleur	e803e06c0d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/admin/tools/listevents.php htdocs/commande/class/commande.class.php htdocs/core/lib/functions.lib.php htdocs/expensereport/card.php htdocs/exports/export.php	2020-01-19 19:01:46 +01:00
Laurent Destailleur	8c8d492a48	FIX Protection to avoid blocking situation with negative lines	2020-01-19 15:19:07 +01:00
Laurent Destailleur	24d439845b	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/product/stock/class/mouvementstock.class.php	2020-01-18 20:20:25 +01:00
Laurent Destailleur	b48c9a5998	Update website templates	2020-01-17 14:09:29 +01:00
VESSILLER	60d4f63205	FIX send expense report mail in HTML format	2020-01-17 13:56:01 +01:00
Laurent Destailleur	ab8078689f	Trans	2020-01-17 13:31:40 +01:00
Laurent Destailleur	48c077af56	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-17 11:39:46 +01:00
Laurent Destailleur	2099e05f22	Fix translation	2020-01-17 11:39:22 +01:00
Laurent Destailleur	9c1e409feb	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-17 11:35:16 +01:00
Laurent Destailleur	906110dc1d	Fix backup. Recommended compression is gzip.	2020-01-17 11:34:31 +01:00
Laurent Destailleur	c556f60c89	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-16 18:13:35 +01:00
Laurent Destailleur	6318f21a8f	Trans	2020-01-16 15:07:18 +01:00
Tobias Sekan	b79c6fc848	Update German language	2020-01-16 10:38:20 +01:00
Laurent Destailleur	ad7278e6a5	FIX Label of DEPOSIT on screen ... Fix look and feel v11	2020-01-16 02:48:24 +01:00
Laurent Destailleur	8f73bce878	Add warning if zip lib missing	2020-01-16 01:11:39 +01:00
Laurent Destailleur	2c40e4be94	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-15 20:13:45 +01:00
Laurent Destailleur	3bd95c205d	Tooltip to understand the new dictionary of holidays	2020-01-15 14:54:17 +01:00
Laurent Destailleur	141ca20269	Trans	2020-01-15 14:44:53 +01:00
Laurent Destailleur	3f79c00542	Merge branch 'develop' into actioncomm_category	2020-01-15 14:21:06 +01:00
Laurent Destailleur	ce2b0b9cad	Trans	2020-01-15 13:51:06 +01:00
Laurent Destailleur	18324962c5	Better help	2020-01-15 13:41:07 +01:00
Laurent Destailleur	5772dce460	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/functions.lib.php	2020-01-15 12:09:21 +01:00
Laurent Destailleur	14d59f43af	Trans	2020-01-15 11:33:02 +01:00
TuxGasy	dcba3d5c7c	New: Professional identifiers for Roumania	2020-01-13 23:00:06 +01:00
Laurent Destailleur	ffd12cd44e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-13 13:44:44 +01:00
Laurent Destailleur	ed2c75a2f8	Merge pull request #12776 from aspangaro/12.0_a4 ... NEW Add social networks of the company	2020-01-13 13:38:16 +01:00
Laurent Destailleur	5740d17450	Better help	2020-01-13 12:10:20 +01:00
Laurent Destailleur	a6bae97826	Sync from transifex	2020-01-12 21:28:09 +01:00
Laurent Destailleur	e03bff87e5	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-10 19:51:26 +01:00
Laurent Destailleur	89ab80e598	Fix typo	2020-01-10 14:41:58 +01:00
Laurent Destailleur	b47db086cb	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/product/inventory/class/inventory.class.php htdocs/product/inventory/list.php	2020-01-10 14:30:42 +01:00
Laurent Destailleur	675ce3b32f	Fix sql error on update of subledger account on a various payment ... Fix warning message that was not accurate	2020-01-10 02:20:08 +01:00
Laurent Destailleur	f48c7d2ecf	Fix modulebuilder	2020-01-09 22:31:23 +01:00
Laurent Destailleur	f9262b0dcf	Transifex sync	2020-01-09 22:30:00 +01:00
Laurent Destailleur	0e58edd896	Fix modulebuilder	2020-01-09 22:27:24 +01:00
Laurent Destailleur	8b696970a7	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-09 17:17:28 +01:00
Laurent Destailleur	cef38016bb	Trans	2020-01-09 17:16:30 +01:00
Laurent Destailleur	cee4fe79a3	Update doc	2020-01-09 12:50:04 +01:00
Laurent Destailleur	124f41f863	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-09 09:10:11 +01:00
Laurent Destailleur	0802df78b5	Debug MRP	2020-01-08 17:56:02 +01:00
Laurent Destailleur	97f62c68f2	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-08 13:38:03 +01:00
Laurent Destailleur	7ef3ee56bd	Fix MRP	2020-01-07 20:28:21 +01:00
Laurent Destailleur	e3c56cea5f	Fix missing lang	2020-01-07 14:19:41 +01:00
Laurent Destailleur	57bbac2015	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-06 14:09:46 +01:00
Laurent Destailleur	804f7f3e1e	Fix modulebuilder templates	2020-01-06 14:03:24 +01:00
Laurent Destailleur	6dcba0f053	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-04 14:27:55 +01:00
Laurent Destailleur	38de69f5a9	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/admin/dict.php htdocs/comm/action/list.php htdocs/compta/bank/releve.php htdocs/compta/salaries/card.php htdocs/core/actions_addupdatedelete.inc.php htdocs/filefunc.inc.php htdocs/langs/en_US/boxes.lang htdocs/langs/en_US/main.lang htdocs/product/class/product.class.php htdocs/product/reassort.php htdocs/product/stock/product.php htdocs/projet/element.php	2020-01-04 14:20:25 +01:00
Laurent Destailleur	b9e0f8999f	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2020-01-04 14:03:21 +01:00
Laurent Destailleur	15ad41ee6d	MRP	2020-01-03 15:01:14 +01:00
Alexandre SPANGARO	93d87d581b	FIX typo on language key	2020-01-03 14:56:49 +01:00
Laurent Destailleur	68d7195964	MRP	2020-01-02 22:09:08 +01:00
Laurent Destailleur	84d0ae7ac5	Trans	2020-01-01 17:31:48 +01:00
Laurent Destailleur	90a78267c5	Trans	2020-01-01 17:31:29 +01:00
Laurent Destailleur	eae0800021	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-01 11:24:10 +01:00
Manu Bryk	14d69c5a2c	New Ref more visible when create a ticket ... When customers call support to trace a ticket, they don't have easily ref of the ticket. Add Ref to the subject of mail for customers and for TICKET_NOTIFICATION_EMAIL_TO. Add ref also to the notification message when customers create a new ticket.	2019-12-31 17:24:37 +01:00
Frédéric FRANCE	90235d0528	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-31 13:57:40 +01:00
Laurent Destailleur	fc49825eaa	Merge pull request #12659 from andreubisquerra/master ... NEW: Takepos supplements	2019-12-30 22:07:19 +01:00
Alexandre SPANGARO	9879a43cf4	NEW Add social networks of the company	2019-12-30 21:17:41 +01:00
Alexandre SPANGARO	a804208b32	Fix missing language key	2019-12-27 20:54:47 +01:00
Alexandre SPANGARO	9a7307eea8	FIX Missing language key for MAIN_MAXTABS_IN_CARD	2019-12-26 12:01:09 +01:00
Laurent Destailleur	07c1a5717e	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/facture_situation.php htdocs/core/class/html.formother.class.php	2019-12-23 14:16:34 +01:00
Laurent Destailleur	9a08a6bf6d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/categories/traduction.php htdocs/compta/facture/class/facture.class.php htdocs/contact/card.php htdocs/core/modules/modSociete.class.php htdocs/fourn/class/fournisseur.product.class.php htdocs/langs/en_US/products.lang htdocs/margin/agentMargins.php htdocs/margin/customerMargins.php htdocs/margin/productMargins.php htdocs/margin/tabs/productMargins.php htdocs/margin/tabs/thirdpartyMargins.php	2019-12-23 14:13:26 +01:00
Laurent Destailleur	2df9df2db0	Debug v11	2019-12-23 12:24:27 +01:00
Laurent Destailleur	4312a4b016	Typo	2019-12-22 16:06:32 +01:00
Laurent Destailleur	22b7b69c47	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-12-22 16:01:32 +01:00
Laurent Destailleur	a739a4dcc3	Fix zh_TW	2019-12-22 13:47:47 +01:00
Laurent Destailleur	05a7e62bf4	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-12-22 12:56:25 +01:00
Laurent Destailleur	f9c3b25dbd	Sync transifex	2019-12-22 12:55:38 +01:00
Laurent Destailleur	e2451bcd26	Update images ... Fix value of delay for warning on project not closed	2019-12-21 17:11:21 +01:00
Laurent Destailleur	ad039ff968	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/install/repair.php	2019-12-21 14:03:45 +01:00
Laurent Destailleur	c0ef3b46ad	Work on MRP module	2019-12-20 15:31:05 +01:00
Laurent Destailleur	2ad483413e	Better place to force the default warehouse	2019-12-19 12:05:34 +01:00
Laurent Destailleur	d9a1e1b348	Fix several non dolibarr behaviour on input of salary payments	2019-12-19 10:01:11 +01:00
Laurent Destailleur	92facbc892	Merge pull request #12726 from atm-gauthier/10.0_fix_units_trad ... FIX : units traductions for selectUnits() function	2019-12-18 12:21:33 +01:00
Alexandre SPANGARO	3fb72c349f	Fix language traduction on import/export tools	2019-12-18 03:25:19 +01:00
Laurent Destailleur	7b1bf32cd9	Update products.lang	2019-12-17 12:19:32 +01:00
gauthier	a672673319	FIX : units traductions for selectUnits() function	2019-12-17 11:25:25 +01:00
Laurent Destailleur	5c8733a84b	More complete message	2019-12-16 19:30:18 +01:00
Laurent Destailleur	65abe7532c	Fix error message not reported when deleting record in ledger.	2019-12-16 19:05:32 +01:00
Laurent Destailleur	98cc2c2886	Add tooltip	2019-12-16 14:29:47 +01:00
Laurent Destailleur	fdf4d86d81	Debug code	2019-12-16 12:38:51 +01:00
Laurent Destailleur	65bf2fa285	Merge pull request #12689 from code-chicken/develop ... Fix: calculation of virtual stock	2019-12-14 13:40:02 +01:00
Frédéric FRANCE	57055bad03	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-13 14:36:00 +01:00
VESSILLER	0396b348f7	NEW add weighted amount on project/opportunity	2019-12-10 09:32:37 +01:00
Laurent Destailleur	ae6d536d1d	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/tools/dolibarr_export.php htdocs/core/lib/functions.lib.php htdocs/core/lib/pdf.lib.php	2019-12-09 13:32:56 +01:00
Laurent Destailleur	94bab15528	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/core/lib/functions.lib.php htdocs/core/lib/pdf.lib.php	2019-12-09 13:27:30 +01:00
Laurent Destailleur	2b5866aca2	WIP Complete module MRP	2019-12-08 23:45:06 +01:00
andreubisquerra	acbd8efa7d	NEW: Takepos supplements	2019-12-08 23:16:49 +01:00
Rüdiger Hahn	d41675b028	Fix translations	2019-12-08 18:15:13 +01:00
Laurent Destailleur	93d66d8213	Debug v11	2019-12-06 08:50:26 +01:00
Frédéric FRANCE	d9bfa62367	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-05 21:47:42 +01:00
Laurent Destailleur	cdb0453661	Help	2019-12-05 14:17:40 +01:00
Laurent Destailleur	e6b4d2f665	Debug sumup	2019-12-04 18:06:05 +01:00
Frédéric FRANCE	4c5c6b6ff1	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-03 17:56:43 +01:00
Florian Mortgat	4846885eea	NEW 9.0: enable user to use the mysqldump '--quick' option ... (useful if the server has low RAM or large tables)	2019-12-02 16:54:05 +01:00
Laurent Destailleur	c692650430	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-12-02 15:23:40 +01:00
Laurent Destailleur	66571df449	Fix remove a link that is private	2019-12-02 15:19:14 +01:00
Frédéric FRANCE	25ed2b930f	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-01 16:10:37 +01:00
Laurent Destailleur	a6408ce9b6	Typo	2019-12-01 13:05:22 +01:00
Laurent Destailleur	eb69538d17	Fix if we insert a product already the product to produce	2019-11-29 23:51:46 +01:00
Laurent Destailleur	d374ce99a1	Trans	2019-11-28 13:20:09 +01:00
Cédric	45bf3e4df9	Merge branch 'develop' into patch-3	2019-11-28 13:11:52 +01:00
Frédéric FRANCE	b2912e688b	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-27 22:54:05 +01:00
Laurent Destailleur	cb352407eb	Add submit	2019-11-26 12:46:40 +01:00
Laurent Destailleur	4ef6c9cc13	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formticket.class.php htdocs/langs/en_US/ticket.lang	2019-11-26 11:54:42 +01:00
Laurent Destailleur	9d2a5e6c42	Trans	2019-11-26 09:08:32 +01:00
Frédéric FRANCE	4c4ae5b6e1	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-26 08:10:40 +01:00
Alexandre SPANGARO	60f19d134c	Fix Ticket - Align language type with datas for translation	2019-11-26 03:58:01 +01:00
Laurent Destailleur	a8c2aa094d	More examples	2019-11-25 20:30:05 +01:00
Laurent Destailleur	61f414488a	Fix translation	2019-11-24 18:34:07 +01:00
Cédric	950a32a433	Checkbox label delete child product FR	2019-11-23 18:11:20 +01:00
Cédric	b959e59554	Checkbox label delete child product EN	2019-11-23 18:09:17 +01:00
atm-greg	ce15af0980	manage packaging on supplier prices	2019-11-23 15:52:34 +01:00
Laurent Destailleur	32f590f274	Merge pull request #12485 from aspangaro/12.0_a2 ... NEW Add shipment widget	2019-11-22 14:39:56 +01:00
Laurent Destailleur	383f095063	Fix trans	2019-11-22 09:45:14 +01:00
Alexandre SPANGARO	2f064567ef	NEW Add shipment widget	2019-11-21 07:50:44 +01:00
Frédéric FRANCE	d182eee4bf	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-19 23:26:00 +01:00
Laurent Destailleur	5d7a1f1265	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contact/card.php htdocs/core/class/extrafields.class.php htdocs/langs/en_US/stocks.lang	2019-11-19 19:02:14 +01:00
Frédéric FRANCE	2e5f539b2a	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-18 17:45:52 +01:00
Alexandre SPANGARO	79ee2b8c4d	Missing language key	2019-11-18 11:48:44 +01:00
Laurent Destailleur	662c622432	Debug MRP	2019-11-17 00:37:08 +01:00
Frédéric FRANCE	6784ea9fae	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-16 09:21:57 +01:00
Laurent Destailleur	4fc7b8c3b1	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/tpl/extrafields_list_search_title.tpl.php	2019-11-14 12:49:42 +01:00
Laurent Destailleur	a29adc94f3	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/comm/card.php htdocs/langs/en_US/admin.lang	2019-11-14 12:48:33 +01:00
Laurent Destailleur	52787b56b2	Fix when limit = 0 ... Look and feel v11	2019-11-14 11:00:49 +01:00
Frédéric FRANCE	05ab4f79ef	categories for actioncomm	2019-11-13 18:44:11 +01:00
Alexandre SPANGARO	85e2546019	Missing language key	2019-11-13 15:25:23 +01:00
Alexandre SPANGARO	0497c399d7	Missing language key	2019-11-13 14:59:07 +01:00
Laurent Destailleur	4340f85e3c	Add warning	2019-11-13 01:22:13 +01:00
Laurent Destailleur	56c2dc2614	Reduce need of translations	2019-11-12 22:29:36 +01:00
Laurent Destailleur	2c718af26c	Missing container type 'menu' ... Fix: Add security if container is not a page	2019-11-12 13:55:46 +01:00
Laurent Destailleur	6afc84fe72	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-11-12 10:20:55 +01:00
Laurent Destailleur	944a15d06b	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-11-12 10:20:16 +01:00
Laurent Destailleur	f8e8d15606	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-11-12 10:19:01 +01:00
Laurent Destailleur	79cc3f189d	Work on BOM	2019-11-11 20:56:28 +01:00
Laurent Destailleur	40d66489ad	Trans	2019-11-11 13:47:17 +01:00
Laurent Destailleur	3054177e79	Fix type of tickets	2019-11-10 12:28:30 +01:00
Laurent Destailleur	880ecda098	Fix name of tables	2019-11-10 12:23:21 +01:00
Laurent Destailleur	ad2ff551fa	Fix trans	2019-11-08 10:35:34 +01:00
Laurent Destailleur	d1c49c7021	Fix trans	2019-11-08 10:24:03 +01:00
Laurent Destailleur	9607f61df5	Merge pull request #12349 from frederic34/patch-13 ... Update agenda.lang	2019-11-07 11:29:59 +01:00
Laurent Destailleur	883fcd7a72	Update agenda.lang	2019-11-07 11:29:45 +01:00
Laurent Destailleur	7144740dfe	Merge pull request #12360 from grandoc/new_branch_06_11_2019 ... fix error message	2019-11-07 11:24:15 +01:00
Laurent Destailleur	74f2983ee1	Debug modulebuilder	2019-11-06 19:38:51 +01:00
Philippe GRAND	1b7fe9a427	fix error message	2019-11-06 10:40:21 +01:00
Frédéric FRANCE	df77370a63	Update agenda.lang	2019-11-05 22:01:06 +01:00
Frédéric FRANCE	7d24610d4c	Update agenda.lang	2019-11-05 21:57:11 +01:00
Laurent Destailleur	0ef249ea52	Debug module BOM	2019-11-05 18:06:33 +01:00
Laurent Destailleur	1aef1c60dd	Merge pull request #11867 from frederic34/socialnetworks ... NEW add socialnetworks dictionary	2019-11-04 21:10:22 +01:00
Laurent Destailleur	17ea978cea	Merge pull request #12306 from frederic34/escpos ... Escpos	2019-11-04 20:40:12 +01:00
Laurent Destailleur	dbb90914bc	Better Trans	2019-11-04 19:53:27 +01:00
Frédéric FRANCE	6ad983bb7b	Merge remote-tracking branch 'upstream/develop' into escpos	2019-11-04 18:52:29 +01:00
Laurent Destailleur	a0db0fccbe	Debug BOM	2019-11-04 15:56:45 +01:00
Laurent Destailleur	8aa2fd04ad	NEW The integrity checker now show the expected size of files	2019-11-04 13:23:48 +01:00
Frédéric FRANCE	872f58f261	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-11-03 21:48:24 +01:00
Frédéric FRANCE	d797ea590e	rework an experimental module	2019-11-03 00:50:58 +01:00
Laurent Destailleur	2ee002fc80	Fix trans	2019-11-02 17:44:58 +01:00
Laurent Destailleur	496f93911f	Merge pull request #11821 from Tim-Otte/develop ... NEW Extrafields support in product supplier prices	2019-11-02 16:19:13 +01:00
Laurent Destailleur	bd4d7b3505	Merge pull request #12268 from atm-john/develop_fix_fatal_hookmanager ... FIX fatal error missing global	2019-11-02 13:07:34 +01:00
Laurent Destailleur	68c971a2b5	All properties 'type_libelle' were renamed into 'type_label'.	2019-11-02 11:12:57 +01:00
Laurent Destailleur	a95a10b8f0	Update doc	2019-11-01 18:45:44 +01:00
Laurent Destailleur	012c5ef0c4	Can use substitution variables into filter of fields link	2019-11-01 18:35:48 +01:00
Laurent Destailleur	2af23aa658	Enhance modulebuilder	2019-11-01 17:54:17 +01:00
Laurent Destailleur	135e65c4aa	Look and feel v11 ... Enhance the progress bar of tasks	2019-11-01 15:53:57 +01:00
Laurent Destailleur	fb95d14aeb	Work on MO	2019-10-31 23:02:51 +01:00
Laurent Destailleur	716c2bb531	Work on MO	2019-10-31 22:46:34 +01:00
Laurent Destailleur	f98df3c807	NEW Can edit link to the translation page in website module	2019-10-31 21:09:33 +01:00
Frédéric FRANCE	f7747ed00a	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-30 20:06:43 +01:00
John Botella	f626f249cf	Fix missing lang	2019-10-30 15:40:06 +01:00
Laurent Destailleur	6a01132fdb	Merge pull request #12210 from grandoc/new_branch_24_10_2019 ... add some comment	2019-10-30 03:17:21 +01:00
Laurent Destailleur	beb85ee3a8	Work on MO	2019-10-30 00:56:57 +01:00
Laurent Destailleur	66337ec234	NEW Add widgets for BOMs and MOs	2019-10-30 00:36:47 +01:00
Frédéric FRANCE	30d416f8c0	Update agenda.lang	2019-10-28 20:16:27 +01:00
Frédéric FRANCE	1ba9612f12	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-27 17:03:50 +01:00
Laurent Destailleur	7f1b67f0e4	Add warehouse for production on MO	2019-10-27 16:28:03 +01:00
Laurent Destailleur	afa3ed499f	Can export BOMs	2019-10-27 15:56:20 +01:00
Laurent Destailleur	eb112d4012	Add qty frozen and disable stock change flag on BOM	2019-10-27 01:49:31 +02:00
Laurent Destailleur	f060ef1018	FIX Clean decimal data for module builder	2019-10-27 00:01:16 +02:00
Frédéric FRANCE	a43e6f96b5	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-25 08:12:54 +02:00
Philippe GRAND	dde9dcbee3	missing translation	2019-10-24 16:29:27 +02:00
Laurent Destailleur	88e848e346	FIX Extrafields missing in export of expense report	2019-10-24 16:00:10 +02:00
Laurent Destailleur	15609e319f	FIX Extrafields missing in export of expense report	2019-10-24 15:57:34 +02:00
Laurent Destailleur	64ac113761	Show dictionaries of a module in module builder	2019-10-24 14:56:43 +02:00
Laurent Destailleur	2201b11fd3	NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_SALE_PROPOSAL ... NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL	2019-10-24 13:41:04 +02:00
Laurent Destailleur	6fa3b53cf7	NEW Module builder can generate CSS of JS file.	2019-10-24 11:41:36 +02:00
Laurent Destailleur	da00591bba	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/product.lib.php htdocs/expedition/card.php htdocs/product/list.php	2019-10-23 04:04:32 +02:00
Laurent Destailleur	f23804a091	FIX #12152	2019-10-23 03:00:19 +02:00
Laurent Destailleur	0180014d4d	Fix link in popup of shipment	2019-10-23 01:35:32 +02:00
Laurent Destailleur	fea12076ee	FIX #12152	2019-10-22 20:24:52 +02:00
Laurent Destailleur	6079a4d159	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/langs/en_US/main.lang	2019-10-22 15:25:31 +02:00
Tim Otte	ceb3482204	Requested changes implemented	2019-10-22 11:36:28 +02:00
Laurent Destailleur	c5490e22d1	Fiw trans	2019-10-22 02:58:55 +02:00
Laurent Destailleur	8e474701c1	Fix missing token	2019-10-21 15:49:08 +02:00
Laurent Destailleur	b21bca17de	Add button Save and stay when editing property of web site	2019-10-21 00:55:52 +02:00
Frédéric FRANCE	9ec7836387	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-20 16:37:18 +02:00
Laurent Destailleur	5a4960f7ae	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php htdocs/takepos/takepos.php	2019-10-20 15:30:28 +02:00
Laurent Destailleur	bf1b2242ea	Fix no focus if we are on edit mode directly	2019-10-20 13:22:29 +02:00
Frédéric FRANCE	f9c0e63f16	Update main.lang	2019-10-17 22:59:52 +02:00
Frédéric FRANCE	aeafdae34c	Update main.lang	2019-10-17 22:58:47 +02:00
Frédéric FRANCE	f4540dddb8	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-17 20:24:04 +02:00
Laurent Destailleur	87ec1de78e	Start to work on solution to sort permissions by module	2019-10-17 18:43:07 +02:00
Laurent Destailleur	40fdcfac7e	Merge branch 'develop' into 10.0_closure2	2019-10-17 18:16:57 +02:00
Laurent Destailleur	1a419a6eb6	Fix translation	2019-10-17 15:15:16 +02:00
Laurent Destailleur	084ab53b4b	Fix translation	2019-10-17 12:14:38 +02:00
Gildas	7ccc07c05f	Fix translation typo in stocks	2019-10-17 12:11:01 +02:00
Laurent Destailleur	7d965e8b92	Merge pull request #12139 from frederic34/patch-17 ... translation for ORDER_SUPPLIER_DELETEInDolibarr	2019-10-16 13:22:46 +02:00
Laurent Destailleur	ffc4820970	Fix counter of BOM	2019-10-16 02:05:23 +02:00
Laurent Destailleur	b0355dd149	Module BOM have now status DRAFT, VALIDATED, DISABLED	2019-10-16 01:20:58 +02:00
Laurent Destailleur	12f1962085	Better error message when module file is corrupted	2019-10-16 00:40:42 +02:00
Frédéric FRANCE	d1d9b1ed85	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-15 09:39:57 +02:00
Frédéric FRANCE	00bac9e989	Update interface_50_modAgenda_ActionsAuto.class.php ... Update agenda.lang Update agenda.lang Update interface_50_modAgenda_ActionsAuto.class.php	2019-10-15 09:38:24 +02:00
Laurent Destailleur	fb3d20107c	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/exports/export.php htdocs/filefunc.inc.php	2019-10-15 03:51:57 +02:00
Frédéric FRANCE	2351750d2b	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-14 19:02:46 +02:00
Laurent Destailleur	4fd12e22cb	Fix trans export	2019-10-14 12:27:44 +02:00
Laurent Destailleur	a33fb47777	Work on MO module	2019-10-14 12:10:14 +02:00
Laurent Destailleur	7973b03201	NEW Add estimated duration on the BOM module	2019-10-14 11:38:36 +02:00
Frédéric FRANCE	d9ba09bec1	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-12 19:02:24 +02:00
Laurent Destailleur	9871dd8770	Debug variants	2019-10-12 15:27:06 +02:00
Laurent Destailleur	dccfdad9dd	Work on inventory feature	2019-10-12 11:32:47 +02:00
Laurent Destailleur	dfaf2ae34b	Trans	2019-10-11 19:20:52 +02:00
Frédéric FRANCE	367ef4acaf	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-11 16:44:25 +02:00
Laurent Destailleur	78bfc8997d	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/link.class.php	2019-10-11 16:14:29 +02:00
Laurent Destailleur	85a4bac9e0	Better translation	2019-10-11 15:22:12 +02:00
Laurent Destailleur	60395f2a9c	NEW Look and feel v11: Some setup pages are by default on edit mode	2019-10-11 14:09:26 +02:00
Laurent Destailleur	4db57f53f9	typo	2019-10-11 11:39:33 +02:00
Laurent Destailleur	de107fb02e	NEW Can set a squarred icon on your company setup	2019-10-11 11:27:05 +02:00
Frédéric FRANCE	03bbfc6ad9	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-10 23:24:50 +02:00
Laurent Destailleur	aebae5ff83	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/margins.lang htdocs/user/class/user.class.php	2019-10-10 10:37:17 +02:00
Frédéric FRANCE	02b706f9c0	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-09 13:40:46 +02:00
Laurent Destailleur	a26281dab3	Merge pull request #12066 from fuhraih/feature1 ... NEW #4301	2019-10-09 11:52:45 +02:00
Laurent Destailleur	f83cc0bcfd	Picto of user umage larger	2019-10-08 21:02:59 +02:00
Laurent Destailleur	6de31f2c54	Better translation	2019-10-08 19:35:50 +02:00
Laurent Destailleur	8921a103c1	Trans	2019-10-08 19:25:54 +02:00
Frédéric FRANCE	f253315c8d	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-08 18:30:58 +02:00
Laurent Destailleur	b13d5aafb3	Trans	2019-10-08 15:45:37 +02:00
Laurent Destailleur	328abc4048	Clean code	2019-10-08 15:43:44 +02:00
fuhraih	eb20341328	Update companies.lang	2019-10-08 15:42:59 +02:00
Laurent Destailleur	37795b1955	Trans	2019-10-08 15:40:07 +02:00
Laurent Destailleur	ef91e0bff3	Trans	2019-10-08 15:35:36 +02:00
Frédéric FRANCE	b78187c1eb	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-08 00:07:27 +02:00
Laurent Destailleur	16eeeecb9a	Trans	2019-10-07 17:08:08 +02:00
Laurent Destailleur	c83f40fc7e	Debug contact by default	2019-10-07 15:42:37 +02:00
Laurent Destailleur	c6c498fd67	Merge pull request #11829 from atm-florian/dev_contactdefault ... NEW : Address/Contact by default on third parties	2019-10-07 15:27:58 +02:00