Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 11:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
53,283 Commits 36 Branches 190 Tags
fb53b41078fbe9cb15cf4c3501729a3747a580b0
Commit Graph

2154 Commits

Author SHA1 Message Date
Laurent Destailleur
54ac3c0a7b Fix regression 2016-03-22 17:41:42 +01:00
Laurent Destailleur
95a45e8f87 Prepare code to be able to download ODT templates 2016-03-22 17:35:58 +01:00
Laurent Destailleur
ced1462b75 Fix regression 2016-03-22 16:59:54 +01:00
Marcos García de La Fuente
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00
aspangaro
3c09e67453 Merge remote-tracking branch 'Upstream/develop' into 4.0-p2 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
 2016-03-21 20:38:17 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
4d78932fe8 NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions 2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
87cd6e1e40 Corrected non-static usages of Form::selectarray function 2016-03-20 14:15:17 +01:00
aspangaro
57ebb7c997 NEW: Move Expense report menu from module to menu files 2016-03-20 07:34:48 +01:00
Laurent Destailleur
2b1f57f01e Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	dev/initdata/savedemo.sh
	htdocs/filefunc.inc.php
	htdocs/user/card.php
 2016-03-18 11:54:14 +01:00
Laurent Destailleur
7fa71214bc Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
	htdocs/core/modules/commande/doc/pdf_proforma.modules.php
 2016-03-18 11:06:41 +01:00
Laurent Destailleur
2c4f01859c Merge pull request #4802 from grandoc/3.9 
[fix]: define  to avoid issue with external pdf models
 2016-03-17 23:13:13 +01:00
Laurent Destailleur
aa7eb4935c FIX VAT rate can be negative. Example spain selling to morroco. 2016-03-17 12:18:47 +01:00
Laurent Destailleur
1683609d9a FIX Check of EAN13 barcode when mask was set to use 13 digits instead of 
12
 2016-03-17 12:00:38 +01:00
philippe grand
d434cee3fa [Qual] Typo 2016-03-17 09:40:05 +01:00
Laurent Destailleur
12bb3932d0 NEW Add filter on a keyword, status and nature into list of modules 2016-03-14 19:40:52 +01:00
Laurent Destailleur
543f5cef63 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	dev/initdata/initdemo.sh
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
 2016-03-13 01:31:12 +01:00
Laurent Destailleur
1b30c1adb4 Fix regression on vat calculation when invoice was not a situation 
invoice
 2016-03-12 20:49:38 +01:00
Laurent Destailleur
2e1a63a1f3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/langs/de_DE/companies.lang
	htdocs/langs/fr_FR/compta.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/commerciaux.php
	htdocs/societe/consumption.php
 2016-03-10 15:09:30 +01:00
Laurent Destailleur
3b035819a9 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
	htdocs/product/document.php
	htdocs/societe/commerciaux.php
 2016-03-10 15:03:53 +01:00
Laurent Destailleur
e0681d0165 Fix unit not visible if not defined 2016-03-09 23:20:44 +01:00
Florian HENRY
a8e2b49c5b FIX : #4768 2016-03-08 10:22:31 +01:00
Laurent Destailleur
896f60a478 hidden solution to solve files overwriting each other 2016-03-06 00:47:00 +01:00
Laurent Destailleur
210d8435da FIX The part added with hidden option MAIN_DOC_USE_TIMING was included 
with a . instead of -. This make os think it is part of extension
instead of file name.
 2016-03-06 00:39:13 +01:00
Laurent Destailleur
d1777a6783 Replace function rand with mt_rand (prepare php 8) 2016-03-05 15:01:25 +01:00
Laurent Destailleur
c63ee8ceb5 Debug module supplier proposal 2016-03-04 16:08:51 +01:00
abb
f9162aa444 new:advanced permissions to validate and unvalidate interventions 2016-02-29 19:16:09 +01:00
Laurent Destailleur
16a716ebbc Merge pull request #4655 from defrance/patch-103 
ODT generation : No segment defined in odt file is not an error
 2016-02-26 11:15:34 +01:00
Laurent Destailleur
54034ea852 NEW Add $object in parameter of pdf_build_address so we could include 
hook into the function.
 2016-02-25 18:30:31 +01:00
Laurent Destailleur
8c43276fda FIX Extrafields of shipments was not included into export fields 2016-02-25 15:46:14 +01:00
Laurent Destailleur
b3c3d3aac5 NEW Add total weight and volume on PDF 
NEW Can hide column qty ordered.
 2016-02-25 14:18:32 +01:00
Laurent Destailleur
a95240e33d FIX Some troubles into weight and volume calculation when unit differs. 
NEW Introduce a function showDimensionInBestUnit
 2016-02-25 13:46:38 +01:00
Laurent Destailleur
b0f816a400 NEW Add weight/volume for one product into shipment export 2016-02-25 02:22:40 +01:00
Laurent Destailleur
02c0f52880 NEW Include sales representative into export of thirdparties 2016-02-24 16:56:24 +01:00
Laurent Destailleur
ac6001cec8 Fix do not show warning if account defined 2016-02-23 12:44:46 +01:00
Laurent Destailleur
843dada35d Fix translation export/import 2016-02-22 17:42:41 +01:00
Laurent Destailleur
ef497e2129 Merge pull request #4669 from peckpeck/translation_import 
Add support to product translation imports
 2016-02-22 16:17:19 +01:00
Laurent Destailleur
77cbd885f2 NEW Add minimum stock and desired stock into import/export profiles. 
NEW Add state into thirdparty export fields
 2016-02-22 15:30:27 +01:00
Laurent Destailleur
f6d1913bb7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2016-02-22 13:35:46 +01:00
Laurent Destailleur
e7e6957073 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-22 09:27:53 +01:00
Laurent Destailleur
a4f189eea7 Fix do not show warning if account defined 2016-02-22 09:27:18 +01:00
Benoît Peccatte
c969b09ef7 Add support to product translation imports 2016-02-21 22:04:47 +01:00
Laurent Destailleur
fb0e74645e Merge pull request #4663 from peckpeck/xlsx_support 
NEW Allow imports from xlsx files
 2016-02-21 19:12:38 +01:00
Benoît Peccatte
5a8d1f1c95 Allow imports from xlsx files 2016-02-21 14:10:19 +01:00
Laurent Destailleur
277d92af75 Secure migration for people using a RC 2016-02-20 03:14:29 +01:00
Laurent Destailleur
82f57b2ccf Better position for modules 2016-02-19 20:05:25 +01:00
Laurent Destailleur
da284cda8c Add category Supplier Relationship Manager 2016-02-19 19:20:21 +01:00
BENKE Charlie
8349446340 No segment defined is not an error 
This is a proposition of correction on all ODT file
If we don't define table of segment on odt we have an error
But in some case we don't want an table on ODT
 2016-02-19 10:59:50 +01:00
Laurent Destailleur
9c8d69eaa9 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2016-02-19 04:46:11 +01:00
Laurent Destailleur
52c82508e4 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/compta/charges/index.php
 2016-02-18 23:27:57 +01:00