2
0
forked from Wavyzz/dolibarr
Commit Graph

56698 Commits

Author SHA1 Message Date
BENKE Charlie
c23919c51a change left menu name of categorie
It is impossible to add sub-menus to other categories left menus if not...
2016-11-30 09:41:33 +01:00
Laurent Destailleur
8fb5eca0ef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-11-29 23:56:52 +01:00
Laurent Destailleur
874bb488da Fix bad comment 2016-11-29 23:42:56 +01:00
Laurent Destailleur
0ec9dd9b88 Merge pull request #6048 from ozit/patch-1
an extra comma at the end
2016-11-29 23:37:41 +01:00
Laurent Destailleur
592b9d0b20 Merge pull request #6061 from mrsof/patch-6
Fix: Product barcode generation in edit mode
2016-11-29 23:34:18 +01:00
Laurent Destailleur
ef029dc602 Merge pull request #6057 from atm-alexis/5.0_FIX_typhon_model
FIX column too small, header on 2 lines
2016-11-29 23:23:19 +01:00
Laurent Destailleur
4bff869507 Merge pull request #6056 from aspangaro/5.0-p38
Presentation of social contribution
2016-11-29 23:22:58 +01:00
Laurent Destailleur
dce3d5d888 Merge pull request #6055 from aspangaro/5.0-p37
Fix: Presentation of donation card
2016-11-29 23:21:46 +01:00
Laurent Destailleur
6624630cd1 Merge pull request #6052 from atm-alexis/FIX_bad_date_for_warning_check
FIX date for warning test might be the same as in propal list
2016-11-29 23:20:44 +01:00
Laurent Destailleur
52205241e3 Merge pull request #6046 from defrance/patch-47
FIX Enabling intervention to process
2016-11-29 23:05:05 +01:00
Laurent Destailleur
401ce91883 Merge pull request #6045 from aspangaro/5.0-p36
Fix: Expense report list return empty date field
2016-11-29 23:04:16 +01:00
Laurent Destailleur
22e2c3ed29 Fix missing pagination on supplier payments 2016-11-29 23:02:37 +01:00
Laurent Destailleur
bd8f923cee Several fixes in filter on lists 2016-11-29 22:52:16 +01:00
Laurent Destailleur
9ff38ee136 Add missing currency for madagascar 2016-11-29 12:28:17 +01:00
Sof
e05de2942b Fix: update informations 2016-11-29 12:19:01 +01:00
Sof
53d1dbf4b9 Fix: Codebar suggestion in edit mode 2016-11-29 12:06:58 +01:00
Laurent Destailleur
39c2088aa5 Fix constant 2016-11-29 11:23:15 +01:00
Laurent Destailleur
c33e486828 Fix order of option and picto 2016-11-29 10:42:10 +01:00
Laurent Destailleur
f267273251 Missing translation 2016-11-29 10:38:27 +01:00
Alexis Algoud
360c952e5a FIX column too small, header on 2 lines 2016-11-29 09:50:55 +01:00
aspangaro
953feefb6a Social contribution in adaptive mode (Payment are under the information) 2016-11-29 06:43:16 +01:00
aspangaro
d73c24bb45 Social contribution in adaptive mode (Payment are under the information) 2016-11-29 06:34:20 +01:00
Laurent Destailleur
83972b39ce Complete work on dol_banner. Fix errors due to missing columns. 2016-11-28 23:58:36 +01:00
aspangaro
fc0edc3499 Uniformize presentation of social contribution - Add button cancel in create mode 2016-11-28 21:27:02 +01:00
aspangaro
85a37eb0ba Fix: Presentation of donation card 2016-11-28 20:48:43 +01:00
Laurent Destailleur
4eb397557f Debug accounting module 2016-11-28 19:30:55 +01:00
Alexis Algoud
950a63f121 FIX date for warning test might be the same as in propal list 2016-11-28 15:53:31 +01:00
Oziel AO
2c8f2f220a an extra comma at the end
note             text
not
  note             text,
2016-11-28 12:29:30 +01:00
Laurent Destailleur
5e5ce0043e Debug module ECM. 2016-11-28 12:03:33 +01:00
BENKE Charlie
8002187912 Enabling ficheintertoprocess 2016-11-28 10:34:03 +01:00
aspangaro
044c4bda3b Fix: Expense report return empty date field 2016-11-28 06:53:34 +01:00
Laurent Destailleur
e59edca855 Fix Responsive design 2016-11-27 20:55:59 +01:00
Laurent Destailleur
ccba387691 Fix Responsive design 2016-11-27 20:18:10 +01:00
Laurent Destailleur
e52e17eec2 Fix Responsive design 2016-11-27 20:11:39 +01:00
Laurent Destailleur
604b3eff8d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-11-27 20:03:11 +01:00
Laurent Destailleur
663f7938f8 Fxi responsive design 2016-11-27 20:02:57 +01:00
Laurent Destailleur
bf2b75f990 Merge pull request #6042 from IonAgorria/receive-trigger
FIX: Supplier order statut is not reverted if RECEIVE trigger fails
2016-11-27 16:27:40 +01:00
Laurent Destailleur
18a1f9033c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/api/class/api_generic.class.php
	htdocs/api/index.php
2016-11-27 16:25:38 +01:00
Laurent Destailleur
65951d2f1b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-11-27 16:09:30 +01:00
Laurent Destailleur
017b18d5c6 Fix #6037 #6041 2016-11-27 16:09:16 +01:00
Laurent Destailleur
ce10dc618c Merge pull request #6040 from atm-florian/DEV_thirpdarty_extrafields_export_on_contact
FIX missing extrafields of thirdparty on contact export
2016-11-27 15:20:14 +01:00
Laurent Destailleur
66901e8602 Merge pull request #6036 from hregis/4.0_bug
Fix: use string instead integer
2016-11-27 15:11:02 +01:00
Laurent Destailleur
1e647b082c Merge pull request #6034 from aternatik/api_rest_allow_post
FIX Minor fixes for REST API
2016-11-27 15:10:03 +01:00
Laurent Destailleur
2e5634e60f Fix responsive design 2016-11-27 14:21:23 +01:00
Laurent Destailleur
2c9edd4205 Maxi debug on list. Fix responsive design. 2016-11-27 13:49:46 +01:00
Laurent Destailleur
e4a8342aef Fix div-table-form balance on all lists (solve responsive design) 2016-11-27 11:41:10 +01:00
Ion Agorria
f7a07f2491 Supplier order statut is not reverted on RECEIVE trigger fail 2016-11-26 22:13:31 +01:00
Laurent Destailleur
60c494fd5f Missing dolibarr version in dump file 2016-11-26 17:48:06 +01:00
Laurent Destailleur
e6fb118155 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2016-11-26 15:52:17 +01:00
Laurent Destailleur
b63ad019ce Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-11-26 15:49:11 +01:00