Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 19:41:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
61,071 Commits 36 Branches 190 Tags
8f34de1036680906ebdb8c05e6460077b5dc4b43
Commit Graph

3512 Commits

Author SHA1 Message Date
bgenere
2e45a8e8b3 Merge remote-tracking branch 'upstream/develop' into develop 2016-11-29 17:15:00 +01:00
Laurent Destailleur
83972b39ce Complete work on dol_banner. Fix errors due to missing columns. 2016-11-28 23:58:36 +01:00
gauthier
9a1309256d Merge branch 'NEW_reduc_on_excess_received' of github.com:atm-gauthier/dolibarr into develop_NEW_reduc_on_excess_received 2016-11-28 17:13:09 +01:00
bgenere
093942bcd7 Fixed display issue for custom modules dictionnary not displayed 
properly when blank exists in dictionnary list for core modules.
 2016-11-28 15:37:24 +01:00
Marcos García de La Fuente
cf0ee36150 Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/core/class/html.form.class.php
#	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-11-27 18:10:01 +01:00
Laurent Destailleur
16ce156631 Fix responsive design 2016-11-25 18:32:52 +01:00
gauthier
c433829d27 NEW : interface 2016-11-25 11:04:42 +01:00
Laurent Destailleur
5acd09b2d5 Fix require_once instead of require. 2016-11-24 17:03:18 +01:00
Laurent Destailleur
b035b1e196 Merge remote-tracking branch 'origin/4.0' into develop 2016-11-20 15:48:24 +01:00
Laurent Destailleur
e3c529d483 FIX javascript error when using on mobile/smartphone 2016-11-20 15:38:48 +01:00
Laurent Destailleur
e6894eda0e Better responsive 2016-11-20 10:58:28 +01:00
Laurent Destailleur
7ac96da0d4 Several fix in warehouse stock change (rounding, api rest) 2016-11-18 16:34:03 +01:00
Laurent Destailleur
0b3765dd9a Fix phpcs 2016-11-18 13:17:24 +01:00
Laurent Destailleur
ad981a0f07 FIX the key for getEntity was different for same element. 2016-11-18 12:54:08 +01:00
Laurent Destailleur
4768017662 Debug of module accountancy 2016-11-16 19:23:32 +01:00
florian HENRY
ff734bb5d9 Fix travis 2016-11-16 09:40:29 +01:00
Laurent Destailleur
2961039b98 Code comment 2016-11-15 13:14:26 +01:00
Laurent Destailleur
62e0d4ec3f FIX Several problems into shipment management with lot enabled 2016-11-14 14:34:15 +01:00
Laurent Destailleur
ecbe719f23 FIX Several problems into shipment management with lot enabled 2016-11-14 13:40:41 +01:00
Laurent Destailleur
cc70b51ba3 Fix missing warning 2016-11-14 02:25:59 +01:00
Laurent Destailleur
a369514e46 Tooltip help better 2016-11-13 20:43:34 +01:00
Laurent Destailleur
6014345fb7 Fix typo error 2016-11-13 18:28:06 +01:00
Laurent Destailleur
4bcc7dc8a0 CLOSE #4368 #4369 Add hook completeTabsHead for rewrite heads tabs menu 2016-11-12 14:36:52 +01:00
aspangaro
e13e66ce7b Update works 2016-11-12 07:40:08 +01:00
aspangaro
137561aec9 Merge remote-tracking branch 'Upstream/develop' into 5.0-p35 2016-11-12 06:31:06 +01:00
Laurent Destailleur
b1bd9e4930 Responsive design 2016-11-11 23:17:37 +01:00
Laurent Destailleur
7ccc70e00d Fix as suggested for #5960 2016-11-11 15:29:48 +01:00
Laurent Destailleur
071ba4fbfd Fix as suggested for #5960 2016-11-11 15:27:29 +01:00
Laurent Destailleur
cd9f1db229 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
 2016-11-11 15:12:30 +01:00
Laurent Destailleur
a605e0b972 Fix phpcs 2016-11-11 15:06:31 +01:00
Laurent Destailleur
fd1c0f404c Merge pull request #5864 from hregis/4.0_bug 
Fix: add possibility to change width type to prevent some display issues
 2016-11-11 14:55:28 +01:00
Laurent Destailleur
9606f67bdb Better responsive design 2016-11-10 14:57:50 +01:00
Laurent Destailleur
cc64994f30 Better responsive design 2016-11-10 11:33:25 +01:00
Laurent Destailleur
9bff6f966b NEW Can add event from the card listing events 2016-11-08 14:08:48 +01:00
Laurent Destailleur
7a94cfc994 NEW Better filtering of automatic/manually inserted events. 2016-11-08 13:03:20 +01:00
Laurent Destailleur
341e014a3d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/document.php
 2016-11-08 11:36:31 +01:00
Laurent Destailleur
bb5df3beeb Fix missing tab 2016-11-07 04:02:16 +01:00
Laurent Destailleur
90881f2fa9 FIX Sanitize title of ajax_dialog 2016-11-07 00:15:58 +01:00
Marcos García de La Fuente
286095f5cd Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/core/class/html.form.class.php
#	htdocs/core/tpl/objectline_create.tpl.php
#	htdocs/fourn/facture/card.php
#	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-11-06 15:01:40 +01:00
Laurent Destailleur
4681c84e1d Better responsive 2016-11-06 12:16:10 +01:00
aspangaro
5ed79800e0 Begin to wok on Vat expense report integration in reports 2016-11-05 07:48:42 +01:00
Laurent Destailleur
0fea6f22a9 Change code to reduce need of jmobile 2016-11-05 03:27:56 +01:00
Laurent Destailleur
e59c2bb61c Debug accounting menu. Can now edit product account if already set. 2016-11-04 16:15:31 +01:00
Laurent Destailleur
a658b7cc3d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/card.php
 2016-10-31 21:31:57 +01:00
Laurent Destailleur
3882fa0c3d Fix dol_buildpath with parameter 3. Add phpunit tests 2016-10-31 10:37:58 +01:00
Laurent Destailleur
1382858f75 Fix log 2016-10-30 17:42:34 +01:00
Laurent Destailleur
3fbba59f69 Better management of status of events 2016-10-30 13:12:35 +01:00
Laurent Destailleur
e9edbba093 NEW Usage of vat code seems ok everywhere. 2016-10-29 21:02:08 +02:00
Laurent Destailleur
658e30aa2f Close #4685 2016-10-29 18:09:57 +02:00
Laurent Destailleur
32b6660f63 Uniformize code 2016-10-29 16:18:39 +02:00