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

45950 Commits

Author SHA1 Message Date
Laurent Destailleur
dd87195a07 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-04-05 17:11:54 +02:00
Laurent Destailleur
ed0ab05b93 FIX Damn, where was the project ref ? 2016-04-05 17:11:44 +02:00
fmarcet
d3794bb145 FIX: Not removing code into vatrate. 2016-04-05 16:49:50 +02:00
Juanjo Menent
10df0e33d4 Merge pull request #4896 from grandoc/3.9 
fix a lot of beug
 2016-04-05 16:49:22 +02:00
Laurent Destailleur
e7adae13ca Code comment 2016-04-05 12:59:17 +02:00
Laurent Destailleur
3738dae38d NEW Add date_rum into table of thirdparty bank account. 2016-04-05 12:06:47 +02:00
Laurent Destailleur
0f0850664d FIX Remove duplicates of shipment modes 2016-04-05 11:47:52 +02:00
Laurent Destailleur
a0a31a3c94 Better responsive design for dictionnaries 2016-04-05 11:24:58 +02:00
Laurent Destailleur
2d102d3132 Bad translation key 2016-04-05 10:24:28 +02:00
Laurent Destailleur
a656e42d42 Missing translation 2016-04-05 10:16:07 +02:00
Laurent Destailleur
6c87dfafae FIX Bad translation key 2016-04-05 10:12:03 +02:00
frederic34
e53501f89d add lang 2016-04-04 18:37:04 +02:00
frederic34
198b9ce8fe Select Preferred Sending Method for a customer 2016-04-04 18:28:55 +02:00
Laurent Destailleur
43165bab02 FIX Filter/search on extrafields on lists 
Conflicts:
	dev/skeletons/skeleton_list.php
	htdocs/projet/list.php
	htdocs/societe/list.php
 2016-04-04 16:22:26 +02:00
Laurent Destailleur
76ad7f36b9 FIX Filter/search on extrafields on lists 2016-04-04 16:03:35 +02:00
Laurent Destailleur
592a041bc5 FIX Filter/search on extrafields on lists 2016-04-04 16:02:29 +02:00
Laurent Destailleur
5101c96223 Restore button to create object from the project view. 2016-04-04 15:25:08 +02:00
Laurent Destailleur
1d700cd286 Keep empty if field value has no value. 2016-04-04 13:26:48 +02:00
Laurent Destailleur
122cd200ec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-04 13:24:36 +02:00
gauthier
e043aebfa1 NEW : project sharing in select_projetcs_list function 2016-04-04 11:05:12 +02:00
Laurent Destailleur
71ef9bc90f Merge pull request #4940 from IonAgorria/fix-facrec 
Fix #4227: Change FactureRec superclass to CommonInvoice
 2016-04-04 09:24:55 +02:00
aspangaro
a85575a93c Merge remote-tracking branch 'Upstream/develop' into 4.0-p16 2016-04-04 05:31:12 +02:00
aspangaro
c6aabd3f34 NEW: Move HRM area page in HRM directory 2016-04-04 05:29:12 +02:00
Laurent Destailleur
21475b587d Merge pull request #4939 from marcosgdf/patch-2 
Corrected PHP documentation of calcul_price_total function
 2016-04-04 00:43:14 +02:00
Laurent Destailleur
30f27b6fac Merge pull request #4933 from frederic34/patch-10 
FIX correctly retreive ref_customer
 2016-04-04 00:36:49 +02:00
Laurent Destailleur
f3c032ba21 Merge pull request #4925 from frederic34/patch-9 
Update llx_propal_merge_pdf_product.sql
 2016-04-04 00:34:40 +02:00
Laurent Destailleur
bd4bdcea37 Merge pull request #4924 from frederic34/patch-8 
FIX Remove sql error when creating table llx_usergroup_extrafields.sql
 2016-04-04 00:33:23 +02:00
Laurent Destailleur
29fc94e416 Merge pull request #4923 from frederic34/patch-7 
FIX Remove sql error when creating table llx_establishment.sql
 2016-04-04 00:31:20 +02:00
Laurent Destailleur
f8fa2202ed Merge pull request #4921 from FHenry/3.9 
Add hook parameters on New search Box
 2016-04-04 00:25:56 +02:00
Laurent Destailleur
f36f33f71b Merge pull request #4915 from defrance/patch-117 
Add contact hook on specific task contact page
 2016-04-04 00:21:57 +02:00
Laurent Destailleur
6a4ca98ad9 Merge pull request #4908 from altatof/fix_bad_rounding 
FIX: systematic rounding causes prices to be updated without reason
 2016-04-04 00:18:18 +02:00
Laurent Destailleur
cab1c0f5cd Merge pull request #4886 from apachler/develop 
Added functionality to get project customer contact as contact_xx tags
 2016-04-04 00:11:19 +02:00
Marcos García
fded7d3e9a Corrected PHP documentation of calcul_price_total function 2016-04-03 22:17:25 +02:00
Laurent Destailleur
89bc29ed45 Try to remove grey background when using jquery jmobile. 2016-04-03 21:08:03 +02:00
Ion Agorria
fbe0414a1f Change FactureRec superclass CommonInvoice 2016-04-03 21:02:19 +02:00
Laurent Destailleur
4ced5ed27f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-03 20:02:28 +02:00
Laurent Destailleur
cea48a8dd6 FIX bad translation language loaded 
FIX When changing thirdparty on event card, the showempty option of
contact was lost.
FIX Bad placeholder shown on combo to select a thirdparty.
 2016-04-03 20:02:02 +02:00
Juanjo Menent
2388887e99 Merge pull request #4938 from aspangaro/4.0-p15 
FIX: Accountancy - Update balance to add description of the accounting account + bugfix
 2016-04-03 17:38:02 +02:00
aspangaro
e79c6c1439 Correct travis error 2016-04-03 17:09:22 +02:00
Juanjo Menent
b3a5c8bae2 Merge pull request #4937 from simnandez/dolibarr-3510 
Close #3510 Add a numbering module for check deposits
 2016-04-03 16:22:34 +02:00
Juanjo Menent
8f2fb64efb Merge pull request #4929 from aspangaro/4.0-p12 
FIX: Problem with dolibarr installation/migration script. Range is a reserved name...
 2016-04-03 16:20:31 +02:00
Juanjo Menent
deeb6f604d Merge pull request #4905 from altatof/fix_margin_display 
FIX: dont retrieve new buying price on margin display
 2016-04-03 16:17:41 +02:00
Juanjo Menent
ba1c029723 Merge pull request #4904 from aspangaro/4.0-p10 
FIX: Accountancy Add informations to show in journal & correct problems to export in bookkee…
 2016-04-03 16:16:30 +02:00
Juanjo Menent
75eb718c01 Merge pull request #4922 from atm-alexis/NEW_multientity_for_project 
FIX multicompany project access
 2016-04-03 16:13:24 +02:00
Juanjo Menent
314069f1da Qual: Remove unused function 2016-04-03 15:47:07 +02:00
aspangaro
f8bc456807 FIX: Accountancy - Update balance to add description of the accounting account + bugfix 2016-04-03 15:32:46 +02:00
Laurent Destailleur
0e6ee0d744 Merge remote-tracking branch 'origin/3.9' into develop 2016-04-03 12:47:02 +02:00
Laurent Destailleur
3aeb579486 Fix bad link 2016-04-03 12:46:34 +02:00
Juanjo Menent
cd6c6f64c5 Merge remote-tracking branch 'upstream/develop' into dolibarr-3510 
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-04-03 12:41:14 +02:00
Juanjo Menent
305bbf1450 Fix Doc 2016-04-03 12:39:39 +02:00
Juanjo Menent
8cd1b95842 Merge pull request #4935 from aspangaro/4.0-p13 
FIX: Accountancy - Correct the display of account_parent in chart of accounts
 2016-04-03 12:36:03 +02:00
Juanjo Menent
e8b2d6baab NEW #3510 : Working 2016-04-03 12:22:18 +02:00
Juanjo Menent
9d189b3c04 NEW #3510 : Working 2016-04-03 12:14:51 +02:00
Juanjo Menent
d55d12baeb NEW #3510 : Working 2016-04-03 11:56:31 +02:00
aspangaro
c48869e02b Bugfix 2016-04-03 10:51:56 +02:00
aspangaro
9cc7b53071 Merge remote-tracking branch 'Upstream/develop' into 4.0-p13 2016-04-03 10:50:33 +02:00
aspangaro
33e8833287 Fix travis 2016-04-03 10:47:21 +02:00
Laurent Destailleur
6096c8c49a Minor fix in CSS 2016-04-02 16:53:55 +02:00
Laurent Destailleur
e954fc07b3 Use natural_search for sql search forging 2016-04-02 16:30:17 +02:00
Laurent Destailleur
127ceeac8c Uniformize code for list of audit events 2016-04-02 16:12:48 +02:00
Laurent Destailleur
10f639507f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-04-02 15:54:51 +02:00
Laurent Destailleur
066c793de2 FIX image extension must be in lower case 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-04-02 15:46:01 +02:00
Laurent Destailleur
c12541f4f2 FIX image extension must be in lower case 2016-04-02 15:00:58 +02:00
Laurent Destailleur
c0b2d7405a FIX Generated thumbs must always use the png format so using thumbs can 
work.
 2016-04-02 14:46:04 +02:00
Laurent Destailleur
599b225489 FIX Creation of thumb image for size "small" was not done. 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-04-02 14:21:50 +02:00
Laurent Destailleur
be8384389f FIX Creation of thumb image for size "small" was not done. 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-04-02 14:20:21 +02:00
Laurent Destailleur
e1bec46a34 FIX The include file for action on files should not be a template file 
but an action include file.
 2016-04-02 14:16:16 +02:00
Laurent Destailleur
66f9f0d046 FIX Creation of thumb image for size "small" was not done. 2016-04-02 14:15:38 +02:00
aspangaro
0c5f504881 FIX: Accountancy - Correct the display of account_parent 2016-04-02 06:22:31 +02:00
Laurent Destailleur
281b06a2d3 NEW Introduce option MAIN_WEIGHT_DEFAULT_UNIT and 
MAIN_VOLUME_DEFAULT_UNIT to force output unit for weight and volume.
 2016-04-01 18:44:23 +02:00
Frédéric FRANCE
d4529d19c7 Update facture.php 
ref_client in order
ref_customer in shipping
 2016-04-01 17:32:58 +02:00
Laurent Destailleur
7edd1d89a0 Fix missing td 2016-04-01 16:59:17 +02:00
Laurent Destailleur
d14f3d7e2b FIX When deleting last shipment, status "shipment in progress" of order 
must move back to status "validated".
 2016-04-01 16:59:08 +02:00
Laurent Destailleur
e40b678d7b Uniformize code 2016-04-01 16:29:47 +02:00
Laurent Destailleur
97b5026ad8 Uniformize code and css 2016-04-01 16:18:45 +02:00
Laurent Destailleur
9c394b58b5 Move help text at better place. 2016-04-01 12:40:34 +02:00
Laurent Destailleur
be483bd787 FIX Some records were lost into margin per product report 2016-04-01 12:28:15 +02:00
Laurent Destailleur
8a1358d539 FIX Some records were lost into margin per product report 2016-04-01 12:27:49 +02:00
Laurent Destailleur
27ed9ba3da Remove now link useless here 2016-04-01 12:13:43 +02:00
Laurent Destailleur
feb35adbe1 FIX Missing clean of criteria 2016-04-01 12:04:07 +02:00
Laurent Destailleur
063905ea03 Save space again (another line won) 2016-04-01 11:43:11 +02:00
Laurent Destailleur
9eb1925825 FIX No need to ask doc template when only one is defined 2016-04-01 11:12:49 +02:00
Laurent Destailleur
c340745b78 FIX Option "showstock" was not effective into warehouse list 2016-04-01 11:05:15 +02:00
Laurent Destailleur
0981039573 FIX If stock module not enabled, it was not possible to make shipments 2016-04-01 10:57:18 +02:00
aspangaro
1df1e775ee Space2 2016-04-01 06:49:24 +02:00
aspangaro
e118aad95f Space 2016-04-01 06:48:17 +02:00
aspangaro
620e03337a Merging problem 2016-04-01 06:45:46 +02:00
aspangaro
84d326e036 FIX: Problem with dolibarr installation/migration script. Range is a reserved name. 2016-04-01 06:41:49 +02:00
Laurent Destailleur
2a19326a3f FIX Missing database escaping on supplier price insert/update 2016-03-31 21:47:32 +02:00
Frédéric FRANCE
90e74b346e Update llx_propal_merge_pdf_product.sql 
No need IF NOT EXISTS at install time
 2016-03-31 17:13:38 +02:00
Frédéric FRANCE
125256c825 Update llx_usergroup_extrafields.sql 
No need IF NOT EXISTS at install time
 2016-03-31 17:11:17 +02:00
Frédéric FRANCE
1419b0e385 Update llx_establishment.sql 2016-03-31 17:06:10 +02:00
Laurent Destailleur
fea9c65906 FIX Missing clean of criteria 2016-03-31 15:22:43 +02:00
root
b018500fd4 FIX multicompany project access 2016-03-31 14:44:18 +02:00
Florian HENRY
f567a2a0ce Search box hook 2016-03-31 12:50:40 +02:00
Laurent Destailleur
9459a36c12 Minor look enhancement 2016-03-31 12:28:45 +02:00
Florian HENRY
5d4c959d2e Add hook parameters on New search Box 2016-03-31 12:18:26 +02:00
Laurent Destailleur
54f3005666 NEW Can select fields to show on proposal lists. 2016-03-31 11:58:05 +02:00
Laurent Destailleur
27cf494009 Fix bad translation 2016-03-30 23:35:43 +02:00
BENKE Charlie
98ef179307 Add contact hook 
I use the same hook name as contactpl
 2016-03-30 21:09:27 +02:00
Laurent Destailleur
2d9c53fc26 NEW Merge all boxes "related objects" into one. This save a lot of room 
on most card and avoid often horizontal scoll.
 2016-03-30 19:18:31 +02:00
Laurent Destailleur
a47accb1c3 FIX PMP is deprecated at warehouse level 2016-03-30 18:08:08 +02:00
Laurent Destailleur
a36abd43fd Merge remote-tracking branch 'origin/3.9' into develop 2016-03-30 16:27:14 +02:00
Laurent Destailleur
7146a8319b FIX Each time we edit a line, we loose the unit price. 2016-03-30 16:26:34 +02:00
Laurent Destailleur
b367c9daac Enhance picto for setup 2016-03-30 16:07:48 +02:00
Laurent Destailleur
0c3635cf8f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-30 15:25:27 +02:00
Laurent Destailleur
e908b983d4 NEW Can search on shipments into the quick search box 2016-03-30 15:25:16 +02:00
Laurent Destailleur
fa10f9e030 FIX #4880 2016-03-30 14:07:07 +02:00
Laurent Destailleur
07e622a7f8 Introduce () to have code cleaner 2016-03-30 14:04:22 +02:00
Laurent Destailleur
a15a46449c Merge pull request #4910 from aspangaro/4.0-p11 
NEW: Accountancy - Drop old table not used (Informations are already presents in llx_accounting_bookkeeping)
 2016-03-30 14:00:50 +02:00
Laurent Destailleur
c730312a9f Merge pull request #4903 from aspangaro/4.0-p9 
NEW: Accountancy - Add category
 2016-03-30 13:58:37 +02:00
Marcos García de La Fuente
362bc106eb FIX Multiprice generator didn't recalculate prices if only the price_base_type property changes 2016-03-30 11:40:57 +02:00
Laurent Destailleur
334cdbc2f5 NEW Option MAIN_LIST_FILTER_ON_DAY is supported on proposal list 2016-03-30 11:13:29 +02:00
Laurent Destailleur
e79633fa8d Fix search on supplier orders 2016-03-30 11:03:39 +02:00
Laurent Destailleur
abcbc5c0da Fix limit management 2016-03-30 10:45:14 +02:00
Andreas Pachler
7eded39e28 Reworked functionality to get project contact as contact_xx tags 2016-03-30 08:34:32 +02:00
aspangaro
9cac252641 NEW: Accountancy - Drop old table not used (Informations are already presents in llx_accounting_bookkeeping) 2016-03-30 06:54:28 +02:00
aspangaro
ef03dc3454 Youps ! 2016-03-30 06:49:10 +02:00
aspangaro
26e017f4ef Merge remote-tracking branch 'Upstream/develop' into 4.0-p9 
Conflicts:
	htdocs/accountancy/admin/card.php
 2016-03-30 06:05:38 +02:00
aspangaro
f6f7dc8e86 Try to correct travis II 2016-03-30 05:41:44 +02:00
Laurent Destailleur
0d9a86db3f Minor lool enhancement 2016-03-30 00:06:55 +02:00
Laurent Destailleur
ff96ebf381 Enahnce navigation 2016-03-29 22:09:13 +02:00
aspangaro
29c4971d5a Try to correct travis 2016-03-29 21:14:19 +02:00
Laurent Destailleur
32080e99dd Fix dolistore url 2016-03-29 21:14:12 +02:00
Laurent Destailleur
b51bd74934 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-29 21:09:26 +02:00
Laurent Destailleur
83dd3081d5 FIX #4880. Lang should not be requied to fetch a user 2016-03-29 21:07:53 +02:00
aspangaro
e43043edcb Merge remote-tracking branch 'Upstream/develop' into 4.0-p10 2016-03-29 21:02:46 +02:00
Laurent Destailleur
61c0ee3c6c Merge pull request #4900 from aspangaro/4.0-p8 
NEW: Accountancy Use clean_account to remove 0 at the right when we create an account in chart of accounts
 2016-03-29 20:32:34 +02:00
Laurent Destailleur
12c8ed6cf0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-29 20:21:19 +02:00
Laurent Destailleur
2e5cc98e59 Fix into badges visibility 2016-03-29 20:06:01 +02:00
aspangaro
c9271e04a0 Merge remote-tracking branch 'Upstream/develop' into 4.0-p9 
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-03-29 19:54:41 +02:00
Laurent Destailleur
2e5b61dac7 Merge pull request #4909 from dzroot/patch-1 
Update llx_20_c_departements.sql
 2016-03-29 19:44:40 +02:00
Laurent Destailleur
3142fd3d84 Merge pull request #4899 from aspangaro/4.0-p7 
Correct problem of merging with my last commits
 2016-03-29 19:41:50 +02:00
Laurent Destailleur
718e9a7226 Filter on module origin 2016-03-29 19:18:53 +02:00
Laurent Destailleur
f4bea56a91 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-29 19:18:31 +02:00
Laurent Destailleur
39c18c37b3 Merge pull request #4898 from defrance/patch-115 
Add photo on contact
 2016-03-29 19:18:02 +02:00
Laurent Destailleur
4d37c47990 NEW Can select language from combo list on page to overwrite a 
translation
 2016-03-29 18:05:03 +02:00
AbdelHakim ALLAL
ed0fd32d15 Update llx_20_c_departements.sql 
Correcting ALGERIA Provinces numbers
*Missing AL10
*Correcting the rest
 2016-03-29 15:23:48 +01:00
Laurent Destailleur
98c2ba8c61 Normalize code 2016-03-29 15:41:46 +02:00
Laurent Destailleur
6b4909f802 Lost sort params 2016-03-29 15:31:52 +02:00
Laurent Destailleur
6188c3fced NEW Introduce a predefined job to run database backup 2016-03-29 14:52:27 +02:00
Laurent Destailleur
fce54e9c48 Fix tooltip too large 2016-03-29 12:49:41 +02:00
Christophe Battarel
024f55d461 FIX: systematic rounding causes prices to be updated without reason 2016-03-29 12:02:36 +02:00
Christophe Battarel
b8f3264f60 FIX: dont retrieve new buying price on margin display 2016-03-29 11:37:35 +02:00
aspangaro
1f31163e5e Correct travis 2016-03-28 21:36:57 +02:00
aspangaro
a1d95e11ed Correct table 2016-03-28 21:33:49 +02:00
aspangaro
a67b9afb6c FIX: Add informations to show & correct problems to export in bookkeeping 2016-03-28 21:31:23 +02:00
aspangaro
2be979569d Debug II 2016-03-28 21:03:47 +02:00
aspangaro
cbecb37c59 debug 2016-03-28 15:32:57 +02:00
aspangaro
436fb91901 Uniformize name of table 2016-03-28 14:50:51 +02:00
aspangaro
8acf39cbb1 Uniformize name of table 2016-03-28 13:58:14 +02:00
aspangaro
432cc44ab6 NEW: Accountancy - Add category 2016-03-28 13:51:19 +02:00
aspangaro
98a46fd335 NEW: Accountancy Use clean_account to remove 0 at the right when we create an account in chart of accounts 2016-03-28 08:21:02 +02:00
aspangaro
85d51b0d6f Correct of problem of merging with my last commits 2016-03-28 07:46:55 +02:00
philippe grand
85cd818da1 Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9 2016-03-27 10:50:37 +02:00
BENKE Charlie
34fb67fe99 Add contact photo 2016-03-26 18:12:03 +01:00
BENKE Charlie
962f0e33f7 Add : photo on contact 2016-03-26 18:05:09 +01:00
philippe grand
b3285996dc fix travis issue from commit 139dc9a7 2016-03-26 12:39:08 +01:00
Laurent Destailleur
4145874d34 Better tranlsation message 2016-03-26 12:29:13 +01:00
Laurent Destailleur
aab7575528 FIX Problem when disabling module product or service. They both include 
same boxes, we must not disable box if the other is still active
 2016-03-26 12:28:31 +01:00
Laurent Destailleur
40e0347bb5 More complete dependencies 2016-03-26 12:27:34 +01:00
Laurent Destailleur
1d02f6446f FIX: Box must not visible of module it depends on are not enabled 2016-03-26 11:52:59 +01:00
Laurent Destailleur
22bed60a07 Remove manually other PR that should not be validated (travis errors 
reported on PR with serious mysql error in migration due to use of
reserved keyword "range" as a name of a field).
 2016-03-26 11:19:45 +01:00
Laurent Destailleur
aee5f6dd2a Merge pull request #4894 from defrance/patch-114 
FIX : Qual and some little fix
 2016-03-26 10:27:50 +01:00
Juanjo Menent
dc491fbae9 Merge pull request #4887 from defrance/patch-111 
NEW : INVOICE_CAN_NEVER_BE_CANCELED global
 2016-03-26 09:51:36 +01:00
Laurent Destailleur
0715353960 FIX A not enabled field for list must not into fields to add 2016-03-25 19:44:18 +01:00
Laurent Destailleur
d213002892 FIX A not enabled field for list must not into fields to add 2016-03-25 19:42:42 +01:00
Laurent Destailleur
08e506874a FIX If thirdparty module not enabled, we must hide thirdparty info. 2016-03-25 19:42:14 +01:00
Laurent Destailleur
b42dbe5b37 Fix restore old css. New ergonomy best practice rules tends to ask 
reduce the more we can lines and orders around menu and area. I will
restore the separator when adapting the style to match look of md theme
later...
 2016-03-25 18:45:43 +01:00
Laurent Destailleur
7def29301a Merge pull request #4893 from defrance/patch-113 
FIX : add line of separation between left menu
 2016-03-25 18:21:52 +01:00
Laurent Destailleur
66eaffd9fa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-25 18:19:59 +01:00
BENKE Charlie
51b82eba43 if we not allowed to edit we don't edit 2016-03-25 18:19:51 +01:00
philippe grand
08970e67d7 fix a lot of beug 2016-03-25 18:16:58 +01:00
BENKE Charlie
767ce063df Change done 2016-03-25 18:16:05 +01:00
Laurent Destailleur
facdddbb23 Merge pull request #4888 from defrance/patch-112 
Add : new translations
 2016-03-25 18:13:45 +01:00
Laurent Destailleur
6a58b025f8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-25 18:10:50 +01:00
Laurent Destailleur
bc1b2d048b Uniformise option name 2016-03-25 18:09:42 +01:00
Laurent Destailleur
6aba69c69c Merge pull request #4885 from aspangaro/4.0-p6 
NEW: Move HRM dictionary from module to core dictionaries
 2016-03-25 18:06:57 +01:00
Laurent Destailleur
423120db17 Merge pull request #4876 from atm-alexis/NEW_multientity_for_project 
# New # multientity for project
 2016-03-25 18:01:45 +01:00
Laurent Destailleur
46fe16be0b Merge pull request #4871 from sbechet/develop 
Postgresql compatibility patch + cosmetic
 2016-03-25 17:57:29 +01:00
Laurent Destailleur
00bf8caa8c FIX #4870 2016-03-25 17:55:58 +01:00
Laurent Destailleur
f61f1c7a27 Merge pull request #4857 from marcosgdf/bankacc-misc 
Little refactor
 2016-03-25 17:43:56 +01:00
Laurent Destailleur
30aea901b8 Merge pull request #4855 from marcosgdf/account-oop 
NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country
 2016-03-25 17:41:39 +01:00
BENKE Charlie
6443170c4d FIX : Qual and some little fix 2016-03-25 17:19:45 +01:00
Laurent Destailleur
34c197f268 Restore compatibility 2016-03-25 17:15:08 +01:00
Laurent Destailleur
c8fd12cdaa Update code comment 2016-03-25 17:14:20 +01:00
Laurent Destailleur
b29b5fa71d Merge pull request #4824 from FHenry/dev_jquery 
Last version of JQuery 1.12 and DataTables Componenent with working
 2016-03-25 16:50:26 +01:00
BENKE Charlie
bf2d52894a correct travis too 2016-03-25 16:48:45 +01:00
Laurent Destailleur
a0563b410e Merge remote-tracking branch 'origin/3.9' into develop 2016-03-25 16:24:26 +01:00
Laurent Destailleur
884ba3a0ba Fix bad hook function name 2016-03-25 16:23:09 +01:00
Laurent Destailleur
a2d6cf8549 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-25 16:17:17 +01:00
Laurent Destailleur
9ddae7d7f3 Fix bad hook function name 2016-03-25 16:17:01 +01:00
Laurent Destailleur
7ca1e27103 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-25 16:15:54 +01:00
Laurent Destailleur
f251ca579b Fix bad hook function name 2016-03-25 16:15:35 +01:00
Laurent Destailleur
ea9db792be Merge remote-tracking branch 'origin/3.9' into develop 2016-03-25 16:14:37 +01:00
Laurent Destailleur
7430d09739 Fix bad hook function name 2016-03-25 16:13:22 +01:00
Laurent Destailleur
85cd0038f5 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-25 16:10:10 +01:00
Laurent Destailleur
5e55f0ecce Fix bad function name into hook 2016-03-25 16:07:42 +01:00
Laurent Destailleur
61bc8fc9ef NEW Can edit value date of a vat payment after recording it. 
Conflicts:
	htdocs/compta/localtax/card.php
	htdocs/core/class/html.form.class.php
 2016-03-25 16:01:45 +01:00
Juanjo Menent
aa9a39cab5 NEW #3510 : Standardize module 2016-03-25 15:59:44 +01:00