Laurent Destailleur
|
cb98d6cb93
|
Merge remote-tracking branch 'origin/3.8' into develop
|
2015-07-19 15:32:20 +02:00 |
|
Laurent Destailleur
|
2f2b0df6f8
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/contact/exportimport.php
htdocs/contact/info.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/core/modules/modSociete.class.php
htdocs/core/tpl/document_actions_pre_headers.tpl.php
htdocs/langs/fr_FR/categories.lang
htdocs/main.inc.php
htdocs/product/reassort.php
htdocs/projet/list.php
htdocs/societe/info.php
|
2015-07-19 12:26:31 +02:00 |
|
Laurent Destailleur
|
2bb1945a2f
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/compta/prelevement/class/rejetprelevement.class.php
htdocs/compta/sociales/class/paymentsocialcontribution.class.php
htdocs/contact/exportimport.php
htdocs/contact/ldap.php
htdocs/contact/perso.php
htdocs/contact/vcard.php
htdocs/core/class/commonobject.class.php
htdocs/product/reassort.php
htdocs/projet/liste.php
htdocs/societe/consumption.php
htdocs/societe/info.php
|
2015-07-19 12:04:30 +02:00 |
|
aspangaro
|
d9dd9ff688
|
Merge remote-tracking branch 'Upstream/3.8' into 3.8-1
|
2015-07-16 12:25:37 +02:00 |
|
Laurent Destailleur
|
49d4ff9b5b
|
Merge pull request #3191 from fappels/3.8
Fix #3120 Product Customer price not updated
|
2015-07-16 10:16:39 +02:00 |
|
aspangaro
|
8689b22e14
|
Product card: remove old code
|
2015-07-16 05:31:05 +02:00 |
|
aspangaro
|
f3c3bb708f
|
Move <br>
|
2015-07-16 05:06:46 +02:00 |
|
aspangaro
|
59e88590e0
|
Move my address email to new one
|
2015-07-15 20:30:33 +02:00 |
|
Francis Appels
|
b113e6c6bf
|
Fix #3120 Product Customer price not updated
Re inserted product fetch was removed in commit
e43d4a6239
|
2015-07-13 11:27:35 +02:00 |
|
Laurent Destailleur
|
a9289de616
|
Several fixes. Fix #2927
|
2015-07-13 11:22:18 +02:00 |
|
Laurent Destailleur
|
e31af7f914
|
Can filter list of setup constant on name and extend visibility to all.
|
2015-07-12 18:05:56 +02:00 |
|
Laurent Destailleur
|
11c94a9d3b
|
Clean code
|
2015-07-12 16:50:27 +02:00 |
|
Laurent Destailleur
|
1fb40565f4
|
Fix bad parameters of function select_date
|
2015-07-12 12:50:24 +02:00 |
|
Laurent Destailleur
|
276f057acf
|
Clean trigger codes
Better error message when we insert duplicate barcode.
|
2015-06-30 16:10:03 +02:00 |
|
Laurent Destailleur
|
4a1dfa60a5
|
Uniformize code
|
2015-06-30 13:14:19 +02:00 |
|
Laurent Destailleur
|
ae5b779652
|
Uniformize code
|
2015-06-30 01:34:17 +02:00 |
|
Laurent Destailleur
|
dc050d39eb
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
build/makepack-dolibarr.pl
htdocs/adherents/type.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/js/lib_batch.js
htdocs/core/modules/modUser.class.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/societe/consumption.php
htdocs/user/info.php
htdocs/user/note.php
htdocs/user/param_ihm.php
htdocs/user/perms.php
|
2015-06-29 00:09:28 +02:00 |
|
Laurent Destailleur
|
ce6039f7f6
|
NEW Replace category edition page on members with new select2 component.
|
2015-06-27 23:01:05 +02:00 |
|
Laurent Destailleur
|
b6efa5ed11
|
NEW Can upload files on leave requests. Use more standard permissions.
|
2015-06-27 11:45:23 +02:00 |
|
phf
|
582f9cd214
|
FIX : keep filter by category or by not enough stock if we switch page
|
2015-06-26 11:04:08 +02:00 |
|
aspangaro
|
9d2e964b00
|
Fix: print_liste_field_titre('');
|
2015-06-26 06:23:29 +02:00 |
|
Alexis Algoud
|
d0999e5458
|
FIX hide category if it's not enable
|
2015-06-19 14:30:23 +02:00 |
|
Laurent Destailleur
|
b3c1ebf30a
|
Debug price per customer
|
2015-06-19 12:13:05 +02:00 |
|
Laurent Destailleur
|
eac822d821
|
Merge pull request #3069 from aspangaro/develop-patch33
Fix: Accountancy - SQL error & typo
|
2015-06-19 11:23:43 +02:00 |
|
Laurent Destailleur
|
20da120a49
|
Merge tab to upload photo and other files to same tab. This reduce
duplicate code and avoid users to be lost.
|
2015-06-19 11:19:13 +02:00 |
|
aspangaro
|
fb57941b21
|
typo
|
2015-06-19 06:06:46 +02:00 |
|
Laurent Destailleur
|
b5cc7ae1c8
|
Work on merge tab photos and attached files
|
2015-06-19 00:52:58 +02:00 |
|
Laurent Destailleur
|
d8f86708b1
|
Minor look fix
|
2015-06-19 00:36:03 +02:00 |
|
Laurent Destailleur
|
bbc70004d9
|
Disable option that i can't understand.
|
2015-06-19 00:18:41 +02:00 |
|
Laurent Destailleur
|
425d9bff48
|
Tooltip to make understanding better.
|
2015-06-18 19:33:29 +02:00 |
|
Regis Houssin
|
9c6c3ad65d
|
Fix: wrong user right
|
2015-06-17 16:33:18 +02:00 |
|
Laurent Destailleur
|
ceb0d71f54
|
Merge pull request #3054 from hregis/3.7_photos
Fix: thumb "mini" not deleted
|
2015-06-16 11:38:39 +02:00 |
|
Laurent Destailleur
|
34468644ef
|
Merge remote-tracking branch 'origin/3.5' into 3.6
|
2015-06-16 11:15:16 +02:00 |
|
Regis Houssin
|
5e25c69891
|
Fix: thumb "mini" not deleted
|
2015-06-16 09:28:31 +02:00 |
|
Marcos García de La Fuente
|
2d3ab3b658
|
Merge remote-tracking branch 'upstream/3.5' into bug-2814-2
Conflicts:
ChangeLog
|
2015-06-15 09:39:17 +02:00 |
|
Laurent Destailleur
|
87e07a3038
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
ChangeLog
htdocs/compta/bank/virement.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/product/card.php
htdocs/societe/soc.php
|
2015-06-14 17:18:45 +02:00 |
|
Laurent Destailleur
|
a7cec18081
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/categories/fiche.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/upgrade2.php
htdocs/product/liste.php
|
2015-06-14 17:11:36 +02:00 |
|
Laurent Destailleur
|
f4da53c300
|
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/product/liste.php
htdocs/product/price.php
|
2015-06-14 17:04:24 +02:00 |
|
Laurent Destailleur
|
fadc640335
|
Merge branch 'bug-2835' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-2835
Conflicts:
ChangeLog
|
2015-06-14 16:07:19 +02:00 |
|
Marcos García de La Fuente
|
1215502927
|
Fix Close bug #2814 JPEG photos are not displayed in Product photos page
|
2015-06-13 03:11:17 +02:00 |
|
Juanjo Menent
|
567dece678
|
Merge pull request #3011 from GPCsolutions/3.7-3009
FIX #3009: Better filtering to prevent SQL injection
|
2015-06-12 21:26:14 +02:00 |
|
Marcos García de La Fuente
|
f9574fa458
|
FIX Close #2835 Customer prices of a product shows incorrect history order
|
2015-06-12 19:05:08 +02:00 |
|
Marcos García de La Fuente
|
2051a66cd7
|
FIX Close #2837 Product list table column header does not match column body
|
2015-06-12 18:46:05 +02:00 |
|
Laurent Destailleur
|
4e5ed08ff8
|
Clean code
|
2015-06-12 13:21:21 +02:00 |
|
fmarcet
|
5783c185bd
|
Fix: Not reading external barcode numeration module
|
2015-06-11 10:43:12 +02:00 |
|
Raphaël Doursenaud
|
4ee6c1810e
|
FIX #3009: Better filtering to prevent SQL injection
|
2015-06-11 10:38:29 +02:00 |
|
Raphaël Doursenaud
|
d89955047b
|
FIX #3009: Better filtering to prevent SQL injection
|
2015-06-11 10:37:30 +02:00 |
|
Juanjo Menent
|
49b369035a
|
Merge pull request #3002 from hregis/develop_productprice
NEW: add "productpricecard" hook and uniformize code
|
2015-06-10 21:13:01 +02:00 |
|
Regis Houssin
|
c21156dd13
|
Fix: strict mode hunter
|
2015-06-10 18:58:42 +02:00 |
|
Regis Houssin
|
e43d4a6239
|
NEW: add "productpricecard" hook and uniformize code
|
2015-06-10 18:42:16 +02:00 |
|