Laurent Destailleur
|
f57ea2682a
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/contrat/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/notify.class.php
htdocs/societe/class/societe.class.php
|
2018-02-03 19:33:24 +01:00 |
|
Laurent Destailleur
|
9d0314dbae
|
NEW Add option CONTRACT_SYNC_PLANNED_DATE_OF_SERVICES
|
2018-02-03 18:50:20 +01:00 |
|
Juanjo Menent
|
cdb63bada3
|
FIX: #7974 Contract - Invalid reference on the document
|
2018-01-26 18:13:55 +01:00 |
|
Laurent Destailleur
|
6676178435
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/contact/list.php
htdocs/contrat/card.php
|
2017-12-28 09:56:40 +01:00 |
|
arnaud
|
4ba039d229
|
FIX trans unactivate on contractline
|
2017-12-21 12:07:29 +01:00 |
|
Laurent Destailleur
|
1251807f54
|
Fix several pb in links to projects on create page
|
2017-12-12 10:37:51 +01:00 |
|
Maxime Kohlhaas
|
1f5c2ec13f
|
New extrafields replicated on contract creation
|
2017-11-15 21:20:30 +01:00 |
|
Laurent Destailleur
|
c85acbfc11
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/install/repair.php
|
2017-11-14 19:47:33 +01:00 |
|
Laurent Destailleur
|
b5196b7164
|
FIX A lot of several fix on local taxes and NPR tax
|
2017-11-13 14:24:40 +01:00 |
|
Laurent Destailleur
|
b29f32171c
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/comm/action/class/actioncomm.class.php
htdocs/contrat/card.php
htdocs/core/lib/project.lib.php
htdocs/filefunc.inc.php
|
2017-10-30 18:22:26 +01:00 |
|
Laurent Destailleur
|
cd5e43483e
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/contrat/card.php
htdocs/core/lib/project.lib.php
htdocs/expedition/card.php
htdocs/projet/class/task.class.php
|
2017-10-28 22:08:16 +02:00 |
|
Maxime Kohlhaas
|
7c1d6251f7
|
Fix : contract lines from origin were containing all lines desc
|
2017-10-27 13:27:38 +02:00 |
|
Laurent Destailleur
|
e4645cf2c5
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/blockedlog/class/blockedlog.class.php
htdocs/contrat/card.php
htdocs/societe/card.php
|
2017-10-27 02:12:35 +02:00 |
|
atm-ph
|
08e83983d0
|
Fix empty extrafields if from origin
|
2017-10-26 09:40:12 +02:00 |
|
Laurent Destailleur
|
f24204c79a
|
Error management after extrafield update
|
2017-10-24 19:04:40 +02:00 |
|
Laurent Destailleur
|
7f85d73001
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/card.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contrat/card.php
htdocs/expensereport/card.php
htdocs/fichinter/list.php
htdocs/fourn/commande/card.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/paiement/card.php
htdocs/livraison/card.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/societe/rib.php
htdocs/supplier_proposal/list.php
htdocs/user/card.php
|
2017-10-18 19:51:29 +02:00 |
|
Laurent Destailleur
|
8626d6279a
|
Fix perm to delete files
|
2017-10-18 17:21:30 +02:00 |
|
Scrutinizer Auto-Fixer
|
bd5bffa72c
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2017-10-16 06:47:05 +00:00 |
|
Laurent Destailleur
|
7c9993ef0e
|
Various fixes
|
2017-10-13 12:14:57 +02:00 |
|
Laurent Destailleur
|
b91667e69c
|
Merge pull request #7579 from OPEN-DSI/fix_0003
New add test dates order for start and end dates of a line of a contract
|
2017-10-07 13:16:53 +02:00 |
|
Laurent Destailleur
|
d1ad6e0263
|
Update card.php
|
2017-10-07 13:16:39 +02:00 |
|
KHELIFA
|
dadd3842a0
|
Fix concat desc of lines when create contract from proposal or other
|
2017-10-06 18:01:03 +02:00 |
|
KHELIFA
|
e715a680bf
|
New add test dates order for start and end dates of a line of a contract
|
2017-10-06 17:58:15 +02:00 |
|
Laurent Destailleur
|
9d6498f2a4
|
NEW Search filters in lists are restored when using "back to list"
|
2017-10-03 14:50:52 +02:00 |
|
Laurent Destailleur
|
e3da4188e2
|
GETPOST must not clean data for text input.
|
2017-09-25 00:16:52 +02:00 |
|
Laurent Destailleur
|
f990667b1a
|
NEW Can send email from the member card using email templates.
|
2017-09-22 17:48:38 +02:00 |
|
Laurent Destailleur
|
6d7db96359
|
NEW Option "one email per recipient" when using bulk actions emails.
|
2017-09-22 16:31:05 +02:00 |
|
Laurent Destailleur
|
d4bde2a4ea
|
Fix date substitution for contracts
|
2017-09-22 15:12:36 +02:00 |
|
Laurent Destailleur
|
252f038468
|
Mutualize code of substitutions for emails
|
2017-09-22 14:34:31 +02:00 |
|
Laurent Destailleur
|
ab5724e7ff
|
Mutualize code for forms to send emails. Remove thousand line of code.
|
2017-09-17 17:12:14 +02:00 |
|
Laurent Destailleur
|
961d475a9d
|
More complete substitution system.
Add __CONTRACT_NEXT_EXPIRATION_DATE__ and
__CONTRACT_NEXT_EXPIRATION_DATETIME__
|
2017-09-16 03:45:29 +02:00 |
|
Laurent Destailleur
|
a4086b52ef
|
NEW Can send email from contract card
|
2017-09-16 01:34:15 +02:00 |
|
Laurent Destailleur
|
0873260b8a
|
USe second parameter in GETPOST
|
2017-09-15 10:50:50 +02:00 |
|
Laurent Destailleur
|
149ab80b3a
|
The event array of an object is visible even if no event yet recorded.
|
2017-09-13 14:18:36 +02:00 |
|
Laurent Destailleur
|
07fc0ed3ff
|
NEW Add a button "Activate all services" on contracts
|
2017-09-03 14:26:27 +02:00 |
|
Laurent Destailleur
|
7aa09d8b71
|
NEW Can create thirdparty from card proposal, order or invoice
|
2017-08-28 18:37:16 +02:00 |
|
John
|
56e6794151
|
Fix contract reopen btn if no contract line
|
2017-08-02 14:10:26 +02:00 |
|
Laurent Destailleur
|
7ba5cf5958
|
Debug view of services lines
|
2017-07-31 13:48:00 +02:00 |
|
Laurent Destailleur
|
2b0b2096f6
|
Fix test on mandatory field
|
2017-06-30 22:40:08 +02:00 |
|
Laurent Destailleur
|
6f82837b0f
|
Fix GETPOST of lang_id
|
2017-06-27 17:27:01 +02:00 |
|
Laurent Destailleur
|
a96362e2f9
|
Fix #formmailbeforetitle not supported everywhere
|
2017-06-11 11:40:01 +02:00 |
|
Laurent Destailleur
|
e93cefbbf0
|
FIX #6985
|
2017-06-11 10:37:58 +02:00 |
|
Laurent Destailleur
|
7c0de18ac1
|
Fix code comment
|
2017-06-10 12:56:28 +02:00 |
|
Laurent Destailleur
|
1820649175
|
Maxi debug of v6
|
2017-06-07 19:28:31 +02:00 |
|
Laurent Destailleur
|
80ce8da7a3
|
Fix migration errors and responsive design
|
2017-05-23 15:13:52 +02:00 |
|
Laurent Destailleur
|
aec4cef5de
|
Clean some code for type of event deprecated since 3.3
|
2017-05-19 12:58:38 +02:00 |
|
Laurent Destailleur
|
ff5d682d49
|
Fix css
|
2017-05-18 03:12:29 +02:00 |
|
philippe grand
|
a534f79668
|
Update code using new css class
|
2017-05-12 16:02:01 +02:00 |
|
Laurent Destailleur
|
11b1a2adac
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
|
2017-05-05 14:49:25 +02:00 |
|
Laurent Dinclaux
|
909b489d1f
|
More fixes regarding localtaxes not being diplayed in generated PDF and vat_src_code not being propagating properly when generating posts from type to type.
|
2017-05-04 10:05:55 +11:00 |
|
Laurent Destailleur
|
39ebaec064
|
Replace usage of $bc[$var] with class="oddeven"
|
2017-04-14 11:22:48 +02:00 |
|
Laurent Destailleur
|
e416ea275e
|
Work on 6.0 look and feel
|
2017-03-28 21:04:38 +02:00 |
|
Laurent Destailleur
|
b5b0eba470
|
Several enhancement for 6.0
|
2017-03-28 12:47:48 +02:00 |
|
Laurent Destailleur
|
b9a9997688
|
Page societe/soc.php and compta/facture.php was renamed into card.php
to match page naming conventions.
|
2017-03-20 21:29:22 +01:00 |
|
Laurent Destailleur
|
5f79b2d0c6
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/accountancy/admin/categories.php
htdocs/expensereport/class/expensereport.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
|
2017-03-05 22:11:35 +01:00 |
|
Laurent Destailleur
|
f67c967d0b
|
FIX The vat rate line used when adding a predefined product was wrong if
there is several vat line with same rate.
|
2017-03-04 22:27:44 +01:00 |
|
Laurent Destailleur
|
28ad50e059
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/suppliers.lang
|
2017-03-03 14:31:35 +01:00 |
|
Laurent Destailleur
|
08eaff729f
|
FIX #6461
|
2017-03-03 14:00:38 +01:00 |
|
Laurent Destailleur
|
4929ba16c4
|
Fix on contract card, we must show title in add entry form.
|
2017-03-03 13:14:59 +01:00 |
|
Marcos García de La Fuente
|
d06fb423c0
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/langs/en_US/products.lang
|
2017-02-02 20:07:41 +01:00 |
|
Laurent Destailleur
|
5fd8b1efcb
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-01-22 21:23:35 +01:00 |
|
Laurent Destailleur
|
581b61bef1
|
CSS and look
|
2017-01-22 15:03:07 +01:00 |
|
Laurent Destailleur
|
39151d7a74
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-01-22 12:14:18 +01:00 |
|
Laurent Destailleur
|
65f7de8f64
|
Fix css and look 5.0
|
2017-01-22 12:13:32 +01:00 |
|
BENKE Charlie
|
c0a8752ef4
|
Update card.php
|
2017-01-16 14:17:38 +01:00 |
|
Marcos García de La Fuente
|
d09a3628c5
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/compta/facture.php
|
2017-01-14 23:59:14 +01:00 |
|
Laurent Destailleur
|
32a3f74ea1
|
Merge pull request #6108 from defrance/patch-51
NEW Can send contract by mail from contract card
|
2017-01-12 11:26:44 +01:00 |
|
Marcos García de La Fuente
|
5669f734b8
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/comm/propal/card.php
# htdocs/commande/card.php
# htdocs/compta/facture.php
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
|
2016-12-24 21:39:40 +01:00 |
|
BENKE Charlie
|
85f532f0be
|
bad rights on create order
|
2016-12-10 22:12:41 +01:00 |
|
BENKE Charlie
|
ba8deb29c9
|
Update card.php
|
2016-12-10 12:28:52 +01:00 |
|
BENKE Charlie
|
cbfb7df05e
|
Add send contract by mail
|
2016-12-10 12:23:02 +01:00 |
|
Laurent Destailleur
|
fb45c72cc3
|
Complete use of dol_banner
|
2016-12-09 15:03:57 +01:00 |
|
Laurent Destailleur
|
4b831537e5
|
Fix several problem in notes management of template invoices.
|
2016-12-04 21:27:08 +01:00 |
|
Laurent Destailleur
|
788cbf9a01
|
Complete work on dol_banner on contracts
|
2016-12-04 13:30:17 +01:00 |
|
Laurent Destailleur
|
e59edca855
|
Fix Responsive design
|
2016-11-27 20:55:59 +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 |
|
Laurent Destailleur
|
6eb16f66e0
|
Fix no pdf generation if pdf template not activated
|
2016-11-14 01:32:04 +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 |
|
BENKE Charlie
|
614a0f2077
|
Update card.php
|
2016-11-05 11:05:14 +01:00 |
|
Laurent Destailleur
|
6338b04ac0
|
Remove call of a deprecated function
|
2016-10-24 11:27:39 +02:00 |
|
florian HENRY
|
39aebb6944
|
NEW : add clone contract feature
|
2016-10-14 07:54:44 +02:00 |
|
Laurent Destailleur
|
8755fa07af
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/main.inc.php
|
2016-10-11 12:35:14 +02:00 |
|
Sergio Sanchis Climent
|
9024c225fd
|
FIX: updateligne if $txlocaltax1 is null
|
2016-10-04 00:33:34 +02:00 |
|
Laurent Destailleur
|
c4c7ccc226
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/societe/note.php
htdocs/societe/rib.php
|
2016-09-19 14:05:16 +02:00 |
|
Laurent Destailleur
|
5fb55cc9de
|
Fix css
|
2016-09-18 22:00:59 +02:00 |
|
Laurent Destailleur
|
aa59420413
|
FIX #5712 #5751
|
2016-09-14 19:48:57 +02:00 |
|
Laurent Destailleur
|
0ab377440d
|
Complete param of setValueFrom
|
2016-09-12 20:16:39 +02:00 |
|
Laurent Destailleur
|
0debcf745a
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/cron/card.php
htdocs/cron/list.php
htdocs/filefunc.inc.php
|
2016-09-09 09:32:14 +02:00 |
|
Laurent Destailleur
|
c3bb4a89e4
|
Fix late satus on contract service line
|
2016-09-08 17:53:04 +02:00 |
|
Marcos García de La Fuente
|
05728075d6
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/install/mysql/migration/3.9.0-4.0.0.sql
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
|
2016-09-06 21:06:33 +02:00 |
|
florian HENRY
|
ae34ef98f6
|
Create order from contract
|
2016-09-05 09:42:34 +02:00 |
|
Laurent Destailleur
|
4d4fc87e2b
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/product/stock/productlot_list.php
htdocs/websites/index.php
|
2016-08-09 13:26:08 +02:00 |
|
Laurent Destailleur
|
bcd055b378
|
Move button to link to, in same part of code than code to output links.
|
2016-08-05 15:30:28 +02:00 |
|
Laurent Destailleur
|
7a7e7b330f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2016-08-04 11:58:11 +02:00 |
|
Laurent Destailleur
|
7f6e2a277a
|
NEW Link between objects can be done on both side and on all objects
|
2016-08-04 11:57:37 +02:00 |
|
aspangaro
|
da274f0ca4
|
Uniformize presentation on contract
|
2016-08-03 07:28:00 +02:00 |
|
Laurent Destailleur
|
9ca7f2cb66
|
Better support for option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN (on by
default).
|
2016-07-28 19:02:23 +02:00 |
|
Laurent Destailleur
|
e4f51b7f32
|
FIX Select new thirdparty
|
2016-07-27 14:15:58 +02:00 |
|
Laurent Destailleur
|
a147798f18
|
FIX Select new thirdparty
|
2016-07-27 14:15:14 +02:00 |
|
Laurent Destailleur
|
50f76cbb9c
|
Fix bad css
|
2016-07-24 22:17:40 +02:00 |
|
Laurent Destailleur
|
43a7109c69
|
Fix bad css
|
2016-07-24 21:50:04 +02:00 |
|
Marcos García de La Fuente
|
c082505021
|
NEW Added product attributes feature
|
2016-07-24 11:27:52 +02:00 |
|
Laurent Destailleur
|
028ff5e84c
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/fourn/facture/card.php
htdocs/langs/en_US/products.lang
htdocs/societe/list.php
|
2016-06-01 17:59:50 +02:00 |
|
Laurent Destailleur
|
a1a335025f
|
FIX #5230
|
2016-05-29 12:05:11 +02:00 |
|
Laurent Destailleur
|
05cbfbb38f
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/install/mysql/migration/repair.sql
|
2016-05-17 01:19:49 +02:00 |
|
Laurent Destailleur
|
75b4c61fbc
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/contrat/card.php
|
2016-05-17 00:02:54 +02:00 |
|
Maxime Kohlhaas
|
6278610d0a
|
Fix contract line creation should take desc even if not displayed on screen
|
2016-05-09 15:32:21 +02:00 |
|
Maxime Kohlhaas
|
03732fd1aa
|
Fix contract line creation was adding all proposal lines desc
|
2016-05-09 15:31:44 +02:00 |
|
Laurent Destailleur
|
357877b1fe
|
Debug multicurrency and clean properties of some modules
|
2016-04-12 14:45:59 +02:00 |
|
Laurent Destailleur
|
97b5026ad8
|
Uniformize code and css
|
2016-04-01 16:18:45 +02:00 |
|
Laurent Destailleur
|
91caea5707
|
Code was corrupted with very bad commits. I restore files manually.
|
2016-03-25 15:53:44 +01:00 |
|
Laurent Destailleur
|
8ecfca5a9e
|
Revert change that break compatiblity with 100% of modules
|
2016-03-25 15:26:46 +01:00 |
|
Laurent Destailleur
|
26de415b77
|
Revert commit that break compatibility of 100% of modules
|
2016-03-25 15:24:57 +01:00 |
|
Marcos García de La Fuente
|
89bd173c2f
|
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
|
2016-03-21 21:51:29 +01:00 |
|
Marcos García de La Fuente
|
5a046125db
|
Missing changes from previous commits
|
2016-03-20 14:24:49 +01:00 |
|
Marcos García de La Fuente
|
ff6b187ef3
|
NEW Converted Form::showLinkedObjectBlock to a static function
|
2016-03-20 14:15:21 +01:00 |
|
Marcos García de La Fuente
|
4d78932fe8
|
NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions
|
2016-03-20 14:15:21 +01:00 |
|
Laurent Destailleur
|
bc2043cb79
|
Merge remote-tracking branch 'origin/3.9' into develop
|
2016-03-03 20:48:47 +01:00 |
|
Laurent Destailleur
|
14ab10328c
|
Minor fixes
|
2016-03-03 20:48:11 +01:00 |
|
Laurent Destailleur
|
071ca6d1c4
|
Fix enable/disabled contract
|
2016-03-03 20:46:42 +01:00 |
|
Laurent Destailleur
|
09a9546c14
|
FIX Can not disabled an opened service line in a contract
|
2016-03-03 20:41:56 +01:00 |
|
Laurent Destailleur
|
99553c8230
|
FIX Can not disable an opened service on a contract
|
2016-03-03 20:39:38 +01:00 |
|
Laurent Destailleur
|
3a58613e45
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/accountancy/bookkeeping/listbyyear.php
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/projet/activity/index.php
|
2016-03-02 23:40:11 +01:00 |
|
Alexis Algoud
|
72b532b7eb
|
FIX non instanciated values
|
2016-03-01 11:31:27 +01:00 |
|
Laurent Destailleur
|
8807222f24
|
Fix a lot of fixes to have the french vat npr working better
|
2016-02-27 12:22:39 +01:00 |
|
Laurent Destailleur
|
c86a1a30d5
|
Fix a lot of fixes to have the french vat npr working better
|
2016-02-27 11:46:16 +01:00 |
|
Laurent Destailleur
|
8927948bef
|
NEW Add option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN
|
2016-02-25 16:27:28 +01:00 |
|
Laurent Destailleur
|
5e9fd25a6e
|
Merge remote-tracking branch 'origin/3.8' into 3.9
|
2016-01-30 15:59:40 +01:00 |
|
Laurent Destailleur
|
dfd4d36bdf
|
Merge remote-tracking branch 'origin/3.7' into 3.8
|
2016-01-30 15:58:11 +01:00 |
|
Laurent Destailleur
|
99b2236260
|
FIX Selection of project must no show closed project
|
2016-01-28 12:19:13 +01:00 |
|
Laurent Destailleur
|
c8d232e056
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/contrat/card.php
|
2016-01-28 12:18:25 +01:00 |
|
Laurent Destailleur
|
5fd6057c6c
|
FIX Deadlock situation. Can't edit anymore contract.
FIX List of automatic events was not visible.
|
2016-01-26 18:22:37 +01:00 |
|
fmarcet
|
c2efee8a29
|
FIX: Contrat card don't consider user permissions to show active/unactive service button
|
2016-01-26 13:02:21 +01:00 |
|
Florian HENRY
|
33e73afda6
|
FIX : Cannot change the date of a contract #4088
|
2015-12-03 10:51:03 +01:00 |
|
Laurent Destailleur
|
480623a6d5
|
Uniformize GUI. All lists must have a search on status at end and last
column is dedicaded to future "mass action checkbox".
|
2015-11-29 13:03:46 +01:00 |
|
philippe grand
|
4f280f63d0
|
[Qual] Uniformize code
|
2015-11-19 13:59:58 +01:00 |
|
Raphaël Doursenaud
|
23a5c303dd
|
Fix #3870 Missing translation
|
2015-11-04 19:56:12 +01:00 |
|
Laurent Destailleur
|
da0aa2f937
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
htdocs/langs/en_US/main.lang
htdocs/product/list.php
htdocs/product/stock/mouvement.php
|
2015-11-02 19:31:42 +01:00 |
|
fmarcet
|
310ecb1e09
|
FIX: Show product image on getNomUrl()
|
2015-10-29 12:28:28 +01:00 |
|
philippe grand
|
1762b3aaa7
|
[Qual] Uniformize code
|
2015-10-17 17:09:34 +02:00 |
|
philippe grand
|
f31ddc23aa
|
[Qual] Uniformize code
|
2015-10-17 16:18:33 +02:00 |
|
Laurent Destailleur
|
8c66a7d099
|
Revert a bad PR. if form_confirm is replaced with formconfirm, we must
include a print before. It is no more included into function.
|
2015-10-17 02:01:13 +02:00 |
|
Laurent Destailleur
|
2122d4d43a
|
NEW Contract module can be used to follow both sold and bought
contracts/recurring subscriptions.
|
2015-10-17 00:52:35 +02:00 |
|
Laurent Destailleur
|
a1d37f92cb
|
Several fix in CSS
|
2015-10-09 20:00:43 +02:00 |
|
philippe grand
|
0841feda47
|
syntax error
|
2015-10-08 09:40:00 +02:00 |
|
Juanjo Menent
|
ad1a4c7e15
|
Merge pull request #3598 from GPCsolutions/formconfirm
[Qual] Replaced deprecated form_confirm()
|
2015-09-26 08:48:16 +02:00 |
|
Raphaël Doursenaud
|
485c369d55
|
[Qual] Replaced deprecated form_confirm()
|
2015-09-24 21:10:35 +02:00 |
|
Raphaël Doursenaud
|
631ee83745
|
[Qual] Replaced deprecated print_fiche_titre()
|
2015-09-24 18:34:58 +02:00 |
|
philippe grand
|
e9bb296a4f
|
NEW: : add doActions hook method call in contract card
|
2015-09-03 13:57:38 +02:00 |
|