lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
52,750 Commits 43 Branches 150 Tags 886 MiB
bfbcf7a64c
Commit Graph

9277 Commits

Author SHA1 Message Date
Laurent Destailleur
a12d81cbda Fix PHPCS 2016-03-10 12:36:25 +01:00
Laurent Destailleur
5bd5323c93 Finished to move the mergepdftool dedicated page into the generic "mass 
actions" feature.
 2016-03-10 12:11:11 +01:00
Laurent Destailleur
d0441fa05f NEW: Show into badge on tab head the number of dedicated contacts for 
objects.
 2016-03-10 11:16:12 +01:00
Laurent Destailleur
e0681d0165 Fix unit not visible if not defined 2016-03-09 23:20:44 +01:00
Laurent Destailleur
8ab343e95f Can choose number of decimals into function showDimensionInBestUnit 2016-03-09 23:17:46 +01:00
Laurent Destailleur
09a29322c3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/orderstoinvoice.php
	htdocs/public/demo/index.php
	htdocs/societe/commerciaux.php
 2016-03-08 17:40:21 +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
d8045e33bb FIX Option FCKEDITOR_ENABLE_MAIL was no used into dictionnary page to 
edit email templates
 2016-03-05 12:37:09 +01:00
Laurent Destailleur
446a080c75 NEW Mutualize code to manage email substitution variables. Show 
available variables into page to edit email templates.
 2016-03-05 12:20:58 +01:00
Francis Appels
0890f20a72 Update functions.lib.php 
Add product.lib for function measuring_units_string
 2016-03-04 19:29:08 +01:00
Laurent Destailleur
109eefaf03 Merge pull request #4723 from IonAgorria/default-date-selector 
New: Default values in date selector
 2016-03-04 16:31:42 +01:00
Laurent Destailleur
cbd102fa45 Merge and rename method into camel format 2016-03-04 16:28:38 +01:00
Laurent Destailleur
6e8b176d8d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-04 16:24:03 +01:00
Laurent Destailleur
87093c79f9 Merge pull request #4708 from marcosgdf/account-constants 
Started using Account TYPE and STATUS constants
 2016-03-04 16:23:50 +01:00
Laurent Destailleur
fe13fe06ac Merge pull request #4724 from frederic34/patch-7 
Update html.formfile.class.php
 2016-03-04 16:15:53 +01:00
Laurent Destailleur
36474eabec NEW Add stats and late records into dashboard for supplier proposals. 2016-03-04 16:14:23 +01:00
Laurent Destailleur
c63ee8ceb5 Debug module supplier proposal 2016-03-04 16:08:51 +01:00
Laurent Destailleur
e92318bc13 Better fix to manage several level of beta and rc 2016-03-04 15:21:26 +01:00
Laurent Destailleur
84d2078919 Merge pull request #4710 from hregis/3.9_bug 
Fix: issue during upgrade of MAIN_VERSION_LAST_UPGRADE (rc -> rc2)
 2016-03-04 15:18:59 +01:00
Laurent Destailleur
e60088a297 Add parameter moreinheader 2016-03-04 13:30:00 +01:00
Laurent Destailleur
b75f896b45 NEW Into GED module, filename is truncated only if there is not enough 
space into table
 2016-03-04 11:25:54 +01:00
Laurent Destailleur
fba3970835 Fix missing loading lang 2016-03-04 01:09:31 +01:00
Ion Agorria
4300ca8bdc Use isset instead of !empty in default date 2016-03-04 00:50:47 +01:00
Frédéric FRANCE
902eba67d2 Update html.formfile.class.php 2016-03-03 17:12:16 +01:00
Ion Agorria
6feaaf906c NEW: Configurable default hour and min in date start/end 2016-03-03 16:11:42 +01:00
Ion Agorria
7db306ba77 NEW: Configurable default hour and min in date selector 2016-03-03 14:51:34 +01:00
Laurent Destailleur
40144eee8d NEW linked object can show now the recurring invoices with other linked 
objects.
 2016-03-03 13:38:16 +01:00
Laurent Destailleur
f3745511fd Fix missing translation 2016-03-03 12:15:17 +01:00
Laurent Destailleur
fd2166ed11 Minor enhancement on new recurring invoice generation 2016-03-03 10:42:49 +01:00
Laurent Destailleur
b1c1de422f Enhance look of cron job list 2016-03-03 10:05:40 +01:00
Laurent Destailleur
3a58613e45 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/projet/activity/index.php
 2016-03-02 23:40:11 +01:00
Laurent Destailleur
3b70bbb05a Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/lib/admin.lib.php
 2016-03-02 23:07:42 +01:00
Regis Houssin
057188e1de Fix: comment debug lines 2016-03-02 11:26:43 +01:00
Regis Houssin
e9ac41fb24 Fix: issue during upgrade of MAIN_VERSION_LAST_UPGRADE (rc -> rc2) 2016-03-02 11:23:57 +01:00
Marcos García de La Fuente
b41016da70 Little refactor of FormBank::select_type_comptes_financiers 2016-03-02 11:12:41 +01:00
Marcos García de La Fuente
ff83dd9afe Replaced account type comparisons with TYPE constants 2016-03-02 11:08:57 +01:00
Laurent Destailleur
f96511e187 Merge pull request #4699 from bafbes/abb-11 
new:advanced permissions to validate and unvalidate interventions
 2016-03-02 01:06:19 +01:00
Frédéric FRANCE
a58dda76ed Update product.lib.php 2016-03-01 17:28:08 +01:00
abb
f9162aa444 new:advanced permissions to validate and unvalidate interventions 2016-02-29 19:16:09 +01:00
Laurent Destailleur
846d78dfba FIX Edition of delay (nb of days) for payment term "Immediate" was 
broken.
 2016-02-29 15:43:00 +01:00
Laurent Destailleur
c197ce31b6 NEW Add the admin info on combo of type of contact 2016-02-29 13:24:59 +01:00
Laurent Destailleur
972d95a3c6 Better translation for nature of contact 2016-02-29 13:21:09 +01:00
Laurent Destailleur
be9a144433 FIX Add a test to show bugged module with a bad declaration of 
dictionaries to avoid to see clean module to be breaked.
 2016-02-28 12:43:00 +01:00
Laurent Destailleur
2ee74a80d9 NEW Enhance navigation of project module 2016-02-28 00:01:50 +01:00
aspangaro
1bf188db86 Fix: Double line 2016-02-27 14:34:32 +01:00
Laurent Destailleur
8807222f24 Fix a lot of fixes to have the french vat npr working better 2016-02-27 12:22:39 +01:00
Laurent Destailleur
c86a1a30d5 Fix a lot of fixes to have the french vat npr working better 2016-02-27 11:46:16 +01:00
Laurent Destailleur
23f45c7b7e Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/commande/list.php
	htdocs/core/lib/pdf.lib.php
 2016-02-26 15:45:25 +01:00
Laurent Destailleur
4250fe155a Fix showing ref of shipment on orders (lines too long) 2016-02-26 15:42:07 +01:00
Laurent Destailleur
1fa94e4d6a NEW Introduce position of records into dictionnary of type of contacts 2016-02-26 15:03:07 +01:00
Laurent Destailleur
a5554cc79e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-02-26 13:44:15 +01:00
Laurent Destailleur
c1ea597cb7 Redesign page with customer price to make it easier to understand. 2016-02-26 13:44:03 +01:00
Laurent Destailleur
2e25c7969b Fix when setting a price for a product, selection of product must not 
show any price
 2016-02-26 12:22:32 +01:00
Laurent Destailleur
e115ac90ec Code comment 2016-02-26 12:08:04 +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
f330a1c8e5 Fix phpcs 2016-02-26 10:55:47 +01:00
Laurent Destailleur
b072b5a181 Fix remove some warnings 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2016-02-26 10:45:25 +01:00
Laurent Destailleur
61edda61e1 Fix remove some warnings 2016-02-26 10:38:42 +01:00
Laurent Destailleur
4b4de22a54 NEW Add hook pdf_build_address 
NEW Add option MAIN_PUBLIC_NOTE_IN_ADDRESS
 2016-02-25 20:54:37 +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
cdcad62967 FIX Array of linked elements for PDF contains duplicates and missing 
data
 2016-02-25 18:19:20 +01:00
Laurent Destailleur
7fc58ddabc FIX Array of linked elements for PDF contains duplicates and missing 
data
 2016-02-25 18:18:00 +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
a5c3658f53 Fix bad formatting of order / shipment ref on PDF 2016-02-25 02:45:27 +01:00
Laurent Destailleur
f1ba81ec66 Fix bad formatting of order / shipment ref on PDF 2016-02-25 02:44:34 +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
1ba2407da4 Merge remote-tracking branch 'origin/3.9' into develop 2016-02-25 01:42:03 +01:00
Laurent Destailleur
02c0f52880 NEW Include sales representative into export of thirdparties 2016-02-24 16:56:24 +01:00
Laurent Destailleur
33d5fa38ef Fix pdfBuildThirdpartyName must return main name. Alias should be an 
option.
 2016-02-24 13:30:16 +01:00
Laurent Destailleur
371dec8503 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
	htdocs/langs/en_US/products.lang
	htdocs/langs/fr_FR/companies.lang
 2016-02-24 12:13:12 +01:00
Laurent Destailleur
2747259fbd Fix: missing payment term and condition into update method 2016-02-24 12:01:50 +01:00
Laurent Destailleur
28b8258acb Fix in most cases, we don't need translated value of languages, jsut 
list of language code.
Fix cost price was not updated.
 2016-02-23 19:50:33 +01:00
Laurent Destailleur
ac6001cec8 Fix do not show warning if account defined 2016-02-23 12:44:46 +01:00
Ion Agorria
673f0c70a6 NEW: TimeZone can be supplied to mktime 2016-02-22 22:00:59 +01:00
Laurent Destailleur
843dada35d Fix translation export/import 2016-02-22 17:42:41 +01:00
Laurent Destailleur
ff9a82c96f Merge pull request #4670 from atm-ph/new_add_multicurrency_supplier_invoice_payment 
New add multicurrency supplier invoice payment
 2016-02-22 16:26:31 +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
cfdaa0e13c Fix missing translation 
Fix import of state
 2016-02-22 14:49:30 +01:00
Laurent Destailleur
8e83f4f15c Fix missing translation load 2016-02-22 13:52:01 +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
762ab060e4 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-22 13:28:18 +01:00
Laurent Destailleur
355f091246 FIX Option MAIN_FORCE_STATE_INTO_ADDRESS and SOCIETE_DISABLE_STATE 2016-02-22 13:28:08 +01:00
Laurent Destailleur
945eb9f094 NEW Add the event BILL_PAYED to list of supported events for module 
notification.
 2016-02-22 12:52:01 +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
0dc76fa1cd Merge pull request #4626 from IonAgorria/hide-hourmins-2 
Form changes to add duration info
 2016-02-21 19:22:13 +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
d3960b0809 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/member.lib.php
	htdocs/expedition/card.php
 2016-02-20 04:25:39 +01:00
Laurent Destailleur
277d92af75 Secure migration for people using a RC 2016-02-20 03:14:29 +01:00
Laurent Destailleur
7ff8c2c3db FIX Missing carriage return when phone is into property ->phone 2016-02-20 02:31:42 +01:00
Laurent Destailleur
266fb14a2c FIX Missing carriage return when phone is into property ->phone 2016-02-20 02:19:18 +01:00
phf
b7d99271f8 New add multicurrency on supplier order 2016-02-19 22:25:59 +01:00