lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
53,234 Commits 43 Branches 150 Tags 886 MiB
3ba87be4ef
Commit Graph

3068 Commits

Author SHA1 Message Date
Laurent Destailleur
36b0cb5b23 NEW Merge all admin tools (system and module admin tools) into same 
entry "Admin tools", so now things are clear: All features restricted to
an admin user is inside "setup" (for setup) or "admin tools" (for action
tools) instead of 3 different entries.
 2016-02-16 12:50:15 +01:00
phf
86c8998742 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_add_customer_multicurrency_payment 
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-15 20:53:06 +01:00
Laurent Destailleur
9cbbf07351 Add fields to link recurring invoice lines with contract origin when it 
comes from this.
 2016-02-15 16:13:33 +01:00
Laurent Destailleur
d4c3258385 Fix missing field 
Fix bad value for default value of next date
 2016-02-15 07:36:45 +01:00
Laurent Destailleur
7aaae143fc Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/expedition/card.php
 2016-02-15 02:01:58 +01:00
Laurent Destailleur
e8bc88fffe Merge branch 'new_recurring_invoice' of 
https://github.com/atm-ph/dolibarr into atm-ph-new_recurring_invoice

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-15 00:45:39 +01:00
Laurent Destailleur
71a12824c9 Merge branch 'new_numbering_module_supplier_payment' of 
https://github.com/atm-ph/dolibarr into
atm-ph-new_numbering_module_supplier_payment

Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-15 00:31:33 +01:00
BENKE Charlie
23cb0d437c Update 3.9.0-4.0.0.sql 2016-02-13 10:53:01 +01:00
BENKE Charlie
b21b5e7bb8 Create llx_categorie_user.key.sql 2016-02-13 10:51:24 +01:00
BENKE Charlie
e3444e08a7 Create llx_categorie_user.sql 2016-02-13 10:50:46 +01:00
Laurent Destailleur
d0ab1db19b NEW When emailing is not sent completely, show progression 2016-02-12 14:21:44 +01:00
phf
c4812abd62 Fix can update fields of facture rec 
Fix create invoice from facture rec don't get all properties and add fk_account
 2016-02-12 12:31:43 +01:00
Frédéric FRANCE
ad534c90e6 Update 3.8.0-3.9.0.sql 2016-02-12 10:34:21 +01:00
phf
875e01aeee New add recurrence fields on create form of invoice model 
Fix missing fields in database about multicurrency
 2016-02-11 09:50:35 +01:00
phf
a0cfe9aad8 New add payment with multicurrency module 2016-02-10 23:16:38 +01:00
Florian HENRY
23e35a6012 update size of elementtype column into llx_actioncomm (module_subelement 
name can be longer than 32)
 2016-02-10 14:21:57 +01:00
Laurent Destailleur
5ea9c6dd83 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.formprojet.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/accountancy.lang
 2016-02-09 14:40:25 +01:00
Laurent Destailleur
fcf1e20d5b Merge pull request #4578 from frederic34/sticker 
Dictionnary for label sticker and card format
 2016-02-08 14:49:31 +01:00
Laurent Destailleur
d2708a4225 Merge pull request #4475 from atm-ph/new_multicurrency_module 
New multicurrency module
 2016-02-08 14:44:49 +01:00
Laurent Destailleur
4c859999e8 Fix first install on debian. 2016-02-06 17:19:57 +01:00
Laurent Destailleur
c6fe8e5479 Fix first install on debian. 2016-02-06 17:13:24 +01:00
phf
d66bc6f1b3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_numbering_module_supplier_payment 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2016-02-06 12:57:30 +01:00
Laurent Destailleur
2e1011ca0c Add hidden option MAIN_CAN_HIDE_EXTRAFIELDS to disable a feature that 
seems useless.
 2016-02-06 12:29:02 +01:00
frederic34
e079021de3 data 2016-02-06 12:16:12 +01:00
frederic34
0d11d94234 Merge remote branch 'upstream/develop' into sticker 
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-06 12:12:35 +01:00
frederic34
9c74af63af Dictionnary for label sticker and card format 2016-02-06 12:06:05 +01:00
Laurent Destailleur
cb66448148 Merge pull request #4564 from atm-ph/new_feature_hidden_extrafields 
NEW feature hidden extrafields
 2016-02-05 17:22:51 +01:00
Laurent Destailleur
04043cdb31 Merge pull request #4569 from abcnet-lu/raisons-socials-luxembourg 
Fix: legal forms and professional IDs in Luxembourg
 2016-02-05 10:58:03 +01:00
Laurent Destailleur
807e7b8304 Merge pull request #4560 from abcnet-lu/revert-develop-20160203 
Fix : Add districts and cantons for Luxembourg
 2016-02-05 10:53:51 +01:00
phf
a8e480e392 FIX #3509 payment ref for suppliers 2016-02-04 23:15:06 +01:00
abcnet-lu
490f3eaf82 [#4566] Add legal forms for Luxembourg 2016-02-04 14:41:26 +01:00
phf
75c4888364 NEW feature hidden extrafields 2016-02-03 22:49:43 +01:00
phf
1b552a0b3b Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module 
Conflicts:
	htdocs/core/class/link.class.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-03 18:30:59 +01:00
abcnet-lu
d430676e51 [Close] [#4558] Add districts and cantons for Luxembourg 2016-02-03 12:14:26 +01:00
abcnet-lu
d65ee22529 [Close] [#4555] Update label of intermediary VAT rate for Luxembourg (fix inverted labels) 2016-02-03 09:27:48 +01:00
Laurent Destailleur
1fb1da5be4 Work on website module 2016-02-02 16:24:12 +01:00
Laurent Destailleur
f28d8669d9 Fix: no change of data ref. 2016-02-02 14:43:19 +01:00
Laurent Destailleur
335914ed3e Merge pull request #4554 from abcnet-lu/develop 
Fix: Update VAT rates + label of intermediary VAT rate for Luxembourg
 2016-02-02 14:41:41 +01:00
Florian HENRY
9298f167a7 Fix Travis 2016-02-02 12:32:25 +01:00
abcnet-lu
a196e163e0 [Close] [#4555] Update label of intermediary VAT rate for Luxembourg (fix spaces) 2016-02-02 09:32:38 +01:00
abcnet-lu
755758dd7a [Close] [#4555] Update label of intermediary VAT rate for Luxembourg 2016-02-02 09:28:45 +01:00
bosseal
fb7e1adad7 [Close] [#4553] Update VAT rates for Luxembourg (as they changed in 2015) 2016-02-02 08:23:46 +01:00
Laurent Destailleur
928336c835 NEW Clean and enhance code for cron engine 2016-01-31 15:14:50 +01:00
Laurent Destailleur
7c2ac4b3ee NEW The probability of lead/opportunity can be defined per lead. 2016-01-28 20:04:02 +01:00
phf
8e933ebb2d Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module 2016-01-25 19:31:35 +01:00
Laurent Destailleur
274caf61eb NEW Add statistics for interventions module 2016-01-25 13:34:05 +01:00
Laurent Destailleur
467dc12a7b NEW Module "Supplier commercial proposal" (price request) is set to 
stable status.
 2016-01-25 12:33:38 +01:00
Laurent Destailleur
d65229998b Work on website module 2016-01-25 10:25:52 +01:00
Laurent Destailleur
8d46a56dac Work on CMS module 2016-01-24 21:17:11 +01:00
Laurent Destailleur
c1ebdd3b4f Default url is home 2016-01-24 11:35:33 +01:00
phf
2d4f355792 FIX back quote into migration sql file 2016-01-21 21:57:09 +01:00
phf
f7afbcff68 NEW integration of multicurrency module (creation fields in database and admin) 
NEW add multicurrency_code on create, update and fetch company object
NEW add multicurrency on propal
FIX travis
FIX back quote into sql file
 2016-01-21 21:38:52 +01:00
aspangaro
84ff86ab50 Merge remote-tracking branch 'Upstream/develop' into develop-p3 2016-01-21 20:53:42 +01:00
aspangaro
ddc2e8bfbe Fix: Modify length of code journal for accountancy in bank account 2016-01-21 20:52:15 +01:00
Laurent Destailleur
4dc812618a NEW Add index on invoice status 
NEW Add constant MAIN_LOGTOHTML to 0 into other setup by default to save
time when we need to make debug on hosted instance.
 2016-01-21 10:37:43 +01:00
Laurent Destailleur
6bccac5691 NEW Add Expense report to approve into workboard 
NEW Selection of boxes is move on top
 2016-01-18 11:35:45 +01:00
Laurent Destailleur
4a009d2ad2 NEW On translation admin page, admin can overwrite a translation value. 2016-01-16 00:48:14 +01:00
Laurent Destailleur
e01d964652 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-01-14 23:46:30 +01:00
Laurent Destailleur
89fad007b4 Fix constant() need the string name of a constant to return value of 2016-01-14 11:17:47 +01:00
Laurent Destailleur
97e96bed87 Merge pull request #4360 from GPCsolutions/develop-morelock 
[Security] Detect lockfile even without configuration
 2016-01-12 23:24:34 +01:00
Raphaël Doursenaud
4d8a9abdbc [Security] Detect lockfile even without configuration 2016-01-11 11:10:04 +01:00
Laurent Destailleur
03eccb3336 Prepare database to be able to manage a different opportunity 
probability for each opportunity.
 2016-01-10 19:48:59 +01:00
Laurent Destailleur
59765f81c5 Prepare 4.0 dev 2016-01-10 11:59:21 +01:00
Laurent Destailleur
8653e7fa5c Merge remote-tracking branch 'origin/3.9' into develop 2016-01-10 00:12:51 +01:00
Juanjo Menent
9c0b6ff5a4 Fix: Move table interventions modify from 3.9 to 4.0 2016-01-09 18:08:55 +01:00
Juanjo Menent
66c5d7c9ce Merge pull request #4150 from defrance/patch-84 
Add date start and end of intervention
 2016-01-09 17:56:39 +01:00
Laurent Destailleur
f9933aba0c Install style match application style 2016-01-08 22:23:57 +01:00
Laurent Destailleur
cbe65fbc79 Fix: fields added into 3.8 to store email event was not enough. To late 
to use them. Will be done into 4.0
 2016-01-08 13:05:56 +01:00
Laurent Destailleur
5a49b8ce53 Fix: error when running install twice 
Fix: a minor error was locking the full upgrade process.
 2015-12-31 12:02:22 +01:00
bobby
e557c002c8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-26 11:56:10 +01:00
Laurent Destailleur
8c1f271356 Maxi debug of module leave requests. 2015-12-24 12:37:38 +01:00
Florian HENRY
8006baf592 ry 2015-12-21 13:09:22 +01:00
Laurent Destailleur
a4edd90320 Debug the cron module 2015-12-19 03:27:55 +01:00
Laurent Destailleur
a973c91c24 Fix pagination on cron jobs 
Fix perf when too much lines
 2015-12-19 02:39:44 +01:00
Laurent Destailleur
dc9c5ed5ef Enhance transifex sync 2015-12-18 18:25:09 +01:00
cla
cb96618460 Merge branch 'develop' into develop_sunimport 2015-12-18 10:49:57 +01:00
Laurent Destailleur
5eea1ce7d9 Fix several warnings 2015-12-17 19:37:24 +01:00
cla
ef487c48a4 NEW 
Extrafields for:
- expedition, expeditiondet, livraison, livraisondet
 2015-12-16 16:18:29 +01:00
aspangaro
5cd5413836 Accountancy add a column in table bookkeeping to validate operations 2015-12-16 05:22:50 +01:00
BENKE Charlie
85344aa955 Update llx_fichinter.sql 2015-12-15 11:46:56 +01:00
BENKE Charlie
3e8c670e84 Update 3.8.0-3.9.0.sql 2015-12-15 11:46:20 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-13 16:23:33 +01:00
Laurent Destailleur
a462cd232d Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 16:09:09 +01:00
Laurent Destailleur
4a88c9ea9f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/product/class/product.class.php
 2015-12-13 15:53:57 +01:00
Laurent Destailleur
5f4be14dd2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-12 13:19:55 +01:00
Laurent Destailleur
47fce16778 Merge branch 'develop' of https://github.com/FHenry/dolibarr into 
FHenry-develop

Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-12-11 17:04:19 +01:00
Andreas Pachler
019bc7ba8e added austrian Regions, Departements, Forme Juridique and social charges to migration file from 3.8 to 3.9 2015-12-10 12:56:05 +01:00
Raphaël Doursenaud
c0862762a5 Fix #3930 Removed executable bit 
These files doesn't contain executable code and may pose a security
threat.
 2015-12-09 13:28:36 +01:00
Florian HENRY
96a95d6ae1 Debug accountancy on 3.9 2015-12-09 12:55:08 +01:00
Andreas Pachler
4885c64ab3 added social charges for Austria 2015-12-09 09:32:21 +01:00
Laurent Destailleur
984068c136 Fix length of password too low (password was truncated making them 
inoperent)
 2015-12-06 19:17:39 +01:00
Laurent Destailleur
7f3531a04c Enhance script to track duplicate translation string and use it to 
remove around 50 duplicates.
 2015-12-06 13:34:57 +01:00
BENKE Charlie
1da6b06605 Update 3.8.0-3.9.0.sql 2015-12-04 13:23:13 +01:00
aspangaro
c30728326e Merge remote-tracking branch 'Upstream/develop' into develop-bank 2015-12-04 12:41:51 +01:00
BENKE Charlie
46aaf9c270 Update 3.8.0-3.9.0.sql 2015-12-04 12:34:17 +01:00
BENKE Charlie
2c95344f05 Add date start and end of intervention 2015-12-04 11:09:05 +01:00
Laurent Destailleur
2f02919c70 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-03 10:01:51 +01:00
Laurent Destailleur
c664a492e6 Removed a not used field making mysql error (reserved word). Also this 
field is not required by dolibarr core.
 2015-12-03 10:01:40 +01:00
Laurent Destailleur
055e650adf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-02 23:23:38 +01:00
aspangaro
09a6cc9625 wrong table 2015-12-01 20:17:14 +01:00
aspangaro
882b66c586 HRM - Add bank tab in user to pay salary or expense report 2015-12-01 06:56:26 +01:00
Laurent Destailleur
de730c9762 NEW Introduce cost price on product. 2015-11-30 21:20:45 +01:00
Laurent Destailleur
c55d11869b Billing of supplier or customer order is a process that can be done in 
parallel with shipment or reception, so we show the status on another
field into lists.
 2015-11-29 15:54:32 +01:00
Laurent Destailleur
b47dbc7a5f Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
	htdocs/projet/element.php
 2015-11-26 01:32:21 +01:00
Laurent Destailleur
e438d76df9 NEW Option encrypt password into databae is set to on by default on 
first install.
 2015-11-22 11:32:31 +01:00
Laurent Destailleur
69757210ce Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-21 02:40:21 +01:00
Laurent Destailleur
2eba3c9e81 Comment 2015-11-21 02:39:49 +01:00
Laurent Destailleur
9db71098ac Merge pull request #4031 from FHenry/develop 
PG SQL
 2015-11-21 01:50:47 +01:00
Laurent Destailleur
a906774595 Merge pull request #3979 from atm-alexis/3.9_NEW_add_billed_status_for_supplier_order 
NEW 3.9 add billed status for supplier order
 2015-11-21 00:20:17 +01:00
Laurent Destailleur
401b2a7389 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/theme/md/style.css.php
 2015-11-20 23:47:07 +01:00
Florian HENRY
eac28076c9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-20 11:59:39 +01:00
Juanjo Menent
9ecdfa8be8 Merge pull request #4017 from apachler/develop 
added Regions, Departements and Forme Juridique for Austria
 2015-11-18 22:04:19 +01:00
Florian HENRY
fbe8a181a9 fix pgsql 2015-11-18 14:03:25 +01:00
Laurent Destailleur
735c7b7d68 Code comment 2015-11-18 13:57:01 +01:00
Florian HENRY
0ffc2a226c fix pg migration script 2015-11-18 13:53:04 +01:00
Florian HENRY
28196a5fd9 add pgsql function 2015-11-18 12:24:52 +01:00
Laurent Destailleur
b1c5768de9 NEW Add fields into llx_cronjobs to be able to use job table to queue 
one shot jobs.
 2015-11-17 18:22:39 +01:00
Laurent Destailleur
6dc6bab556 Support of 'small', 'mini' and '' image size everywhere. 2015-11-17 10:38:00 +01:00
Laurent Destailleur
86db029cb3 Merge pull request #4013 from fappels/develop 
Fix migration - remove default for text field
 2015-11-17 10:06:07 +01:00
Andreas Pachler
161b75acfc added Regions, Departements and Forme Juridique for Austria 2015-11-17 06:56:49 +01:00
fappels
e9be3d19f4 Fix migration - remove default for text field 
remove default for user_param value text field
lang typo
 2015-11-16 21:24:08 +01:00
Alexis Algoud
55b23c4918 FIX add billed field in supplier order 2015-11-16 14:55:46 +01:00
fmarcet
9e51cf66dd New: Bolivian regions and departmens 2015-11-16 12:34:59 +01:00
Laurent Destailleur
6bd6be0912 Debug and rename experimental module "supplier proposal". Still work to 
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
 2015-11-15 19:23:39 +01:00
Laurent Destailleur
01058be44c NEW Introduce a "code" into fiels to describe vat. This will allow to 
suggest different vat lines with same value with ability to
differentiate them.
 2015-11-14 17:53:58 +01:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
 2015-11-13 12:35:10 +01:00
Frédéric FRANCE
bab41e40e7 Update 3.8.0-3.9.0.sql 2015-11-12 17:50:52 +01:00
Frédéric FRANCE
bd7687b6ab Update llx_accounting_account.key.sql 2015-11-12 17:47:08 +01:00
aspangaro
05b0ab2eab HRM: Add fk_establishment in llx_user to link an user to an establishment 2015-11-11 15:45:55 +01:00
Laurent Destailleur
f49fab8a7e Rename some files in english and increase fields size. 2015-11-09 16:48:30 +01:00
Laurent Destailleur
6ec33a94c6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-08 15:39:10 +01:00
Laurent Destailleur
bd56396394 Fix migration error 2015-11-08 15:38:57 +01:00
Juanjo Menent
a02100e3c7 Merge pull request #3924 from atm-gauthier/develop_fix_script_creation 
FIX : wrong coma in llx_opensurvey_sondage.sql creation script
 2015-11-08 11:03:26 +01:00
Laurent Destailleur
fa8863d2ea Fix sql migration requests 2015-11-08 01:38:03 +01:00
Florian HENRY
a4fafae109 FIX : Remove column creation for table llx_product_fournisseur_price, 
the column use un calss is fk_supplier_price_expression, and
fk_price_expression does not exist into lx_product_fournisseur_price sql
file declaration
 2015-11-07 17:19:13 +01:00
Laurent Destailleur
439e4a483d Doc comment 2015-11-07 12:37:05 +01:00
Laurent Destailleur
09fb87e47d Prepare tables for categories/tags on projects. Looking for a dev to 
implement categories/tags on projects !
 2015-11-07 11:40:31 +01:00
Laurent Destailleur
b2d9f21253 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-06 18:57:46 +01:00
Gauthier
ef3c7f927e FIX : wrong coma in llx_opensurvey_sondage.sql creation script 2015-11-06 16:38:26 +01:00
Florian HENRY
28b229c83a FIX: #3916 2015-11-06 11:24:52 +01:00
Laurent Destailleur
11f0cad2ab FIX #3912 2015-11-06 11:22:50 +01:00
Florian HENRY
d3d62f7db5 FIX: #3913 2015-11-06 11:11:23 +01:00
Florian HENRY
b0be2b04c7 FIX : #3912 2015-11-06 10:53:33 +01:00
Florian HENRY
f6b8c3a130 FIX : #3912 2015-11-06 10:50:08 +01:00
Laurent Destailleur
0433f20354 Code comment 2015-11-05 22:20:31 +01:00
Laurent Destailleur
e26940ddf7 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/filelist.xml
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
	htdocs/societe/price.php
 2015-11-05 01:50:30 +01:00
Laurent Destailleur
81f0b516b9 Prepare module opensurvey for 'Form' type. 2015-11-04 11:08:46 +01:00
Laurent Destailleur
826cc6db1b Repair old deprecated data 2015-11-04 09:54:13 +01:00
Laurent Destailleur
ea0bf44670 The ckecksum file should not be into sources. Only into packages. 2015-11-03 09:43:39 +01:00
Laurent Destailleur
85af140420 More complete example of odt template for invoices 2015-11-02 15:46:27 +01:00